diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-18 10:50:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-18 10:50:44 -0700 |
| commit | 98ae6878f151b0b508b09a36367c231b707a88cf (patch) | |
| tree | d6fdd23d6f78d0713ac6290c75bf39c2a65c12c7 /sound/soc/Kconfig | |
| 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/Kconfig')
| -rw-r--r-- | sound/soc/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig index ec821a57f84..dccaa4be679 100644 --- a/sound/soc/Kconfig +++ b/sound/soc/Kconfig @@ -10,6 +10,8 @@ config SND_SOC_AC97_BUS config SND_SOC tristate "SoC audio support" + depends on SND + select SND_PCM ---help--- If you want SoC support, you should say Y here and also to the |