diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-18 13:50:44 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-18 13:50:44 -0400 |
| commit | 98ae6878f151b0b508b09a36367c231b707a88cf (patch) | |
| tree | d6fdd23d6f78d0713ac6290c75bf39c2a65c12c7 /sound/soc/at91 | |
| parent | b720a3be1abd0cb5b9b530c0a1b4044fec4de60e (diff) | |
| parent | 5f1545bc45a33361d6bb2fb44af7c35bcd733b9d (diff) | |
Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa:
[ALSA] hda-intel - Fix HDA buffer alignment
[ALSA] hda-codec - Add model for HP Compaq d5750
[ALSA] hda-codec - Add support for MacBook Pro 1st generation
[ALSA] version 1.0.14rc3
[ALSA] hda-codec - Add model for HP Compaq d5700
[ALSA] intel8x0 - Fix Oops at kdump crash kernel
[ALSA] hda-codec - Fix speaker output on MacPro
[ALSA] hda-codec - more systems for Analog Devices
[ALSA] hda-intel - Fix codec probe with ATI contorllers
[ALSA] hda-codec - Add suppoprt for Asus M2N-SLI motherboard
[ALSA] intel8x0 - Fix speaker output after S2RAM
[ALSA] ac97 - fix AD shared shared jack control logic
[ALSA] soc - Fix dependencies in Kconfig files
Diffstat (limited to 'sound/soc/at91')
| -rw-r--r-- | sound/soc/at91/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/at91/Kconfig b/sound/soc/at91/Kconfig index 5bcf08b728b0..a5b2558916c1 100644 --- a/sound/soc/at91/Kconfig +++ b/sound/soc/at91/Kconfig | |||
| @@ -2,8 +2,7 @@ menu "SoC Audio for the Atmel AT91" | |||
| 2 | 2 | ||
| 3 | config SND_AT91_SOC | 3 | config SND_AT91_SOC |
| 4 | tristate "SoC Audio for the Atmel AT91 System-on-Chip" | 4 | tristate "SoC Audio for the Atmel AT91 System-on-Chip" |
| 5 | depends on ARCH_AT91 && SND | 5 | depends on ARCH_AT91 && SND_SOC |
| 6 | select SND_PCM | ||
| 7 | help | 6 | help |
| 8 | Say Y or M if you want to add support for codecs attached to | 7 | Say Y or M if you want to add support for codecs attached to |
| 9 | the AT91 SSC interface. You will also need | 8 | the AT91 SSC interface. You will also need |