diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 13:32:54 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 13:32:54 -0500 |
| commit | 66dc918d42eaaa9afe42a47d07526765162017a9 (patch) | |
| tree | 947411841773dfb076f1aa78bc5be868bc4281a6 /sound/soc/samsung/ac97.h | |
| parent | b2034d474b7e1e8578bd5c2977024b51693269d9 (diff) | |
| parent | 6db9a0f326d3144d790d9479309df480a8f562e4 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (348 commits)
ALSA: hda - Fix NULL-derefence with a single mic in STAC auto-mic detection
ALSA: hda - Add missing NID 0x19 fixup for Sony VAIO
ALSA: hda - Fix ALC275 enable hardware EQ for SONY VAIO
ALSA: oxygen: fix Xonar DG input
ALSA: hda - Fix EAPD on Lenovo NB ALC269 to low
ALSA: hda - Fix missing EAPD for Acer 4930G
ALSA: hda: Disable 4/6 channels on some NVIDIA GPUs.
ALSA: hda - Add static_hdmi_pcm option to HDMI codec parser
ALSA: hda - Don't refer ELD when unplugged
ASoC: tpa6130a2: Fix compiler warning
ASoC: tlv320dac33: Add DAPM selection for LOM invert
ASoC: DMIC codec: Adding a generic DMIC codec
ALSA: snd-usb-us122l: Fix missing NULL checks
ALSA: snd-usb-us122l: Fix MIDI output
ASoC: soc-cache: Fix invalid memory access during snd_soc_lzo_cache_sync()
ASoC: Fix section mismatch in wm8995.c
ALSA: oxygen: add S/PDIF source selection for Claro cards
ALSA: oxygen: fix CD/MIDI for X-Meridian (2G)
ASoC: fix migor audio build
ALSA: include delay.h for msleep in Xonar DG support
...
Diffstat (limited to 'sound/soc/samsung/ac97.h')
| -rw-r--r-- | sound/soc/samsung/ac97.h | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/sound/soc/samsung/ac97.h b/sound/soc/samsung/ac97.h new file mode 100644 index 000000000000..0d0e1b511457 --- /dev/null +++ b/sound/soc/samsung/ac97.h | |||
| @@ -0,0 +1,21 @@ | |||
| 1 | /* sound/soc/samsung/ac97.h | ||
| 2 | * | ||
| 3 | * ALSA SoC Audio Layer - S3C AC97 Controller driver | ||
| 4 | * Evolved from s3c2443-ac97.h | ||
| 5 | * | ||
| 6 | * Copyright (c) 2010 Samsung Electronics Co. Ltd | ||
| 7 | * Author: Jaswinder Singh <jassi.brar@samsung.com> | ||
| 8 | * Credits: Graeme Gregory, Sean Choi | ||
| 9 | * | ||
| 10 | * This program is free software; you can redistribute it and/or modify | ||
| 11 | * it under the terms of the GNU General Public License version 2 as | ||
| 12 | * published by the Free Software Foundation. | ||
| 13 | */ | ||
| 14 | |||
| 15 | #ifndef __S3C_AC97_H_ | ||
| 16 | #define __S3C_AC97_H_ | ||
| 17 | |||
| 18 | #define S3C_AC97_DAI_PCM 0 | ||
| 19 | #define S3C_AC97_DAI_MIC 1 | ||
| 20 | |||
| 21 | #endif /* __S3C_AC97_H_ */ | ||