diff options
author | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
---|---|---|
committer | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
commit | 651dab4264e4ba0e563f5ff56f748127246e9065 (patch) | |
tree | 016630974bdcb00fe529b673f96d389e0fd6dc94 /sound/soc/Kconfig | |
parent | 40b8606253552109815786e5d4b0de98782d31f5 (diff) | |
parent | 2e532d68a2b3e2aa6b19731501222069735c741c (diff) |
Merge commit 'linus/master' into merge-linus
Conflicts:
arch/x86/kvm/i8254.c
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 f743530add8f..4dfda6674bec 100644 --- a/sound/soc/Kconfig +++ b/sound/soc/Kconfig | |||
@@ -5,6 +5,7 @@ | |||
5 | menuconfig SND_SOC | 5 | menuconfig SND_SOC |
6 | tristate "ALSA for SoC audio support" | 6 | tristate "ALSA for SoC audio support" |
7 | select SND_PCM | 7 | select SND_PCM |
8 | select AC97_BUS if SND_SOC_AC97_BUS | ||
8 | ---help--- | 9 | ---help--- |
9 | 10 | ||
10 | If you want ASoC support, you should say Y here and also to the | 11 | If you want ASoC support, you should say Y here and also to the |
@@ -31,6 +32,7 @@ source "sound/soc/sh/Kconfig" | |||
31 | source "sound/soc/fsl/Kconfig" | 32 | source "sound/soc/fsl/Kconfig" |
32 | source "sound/soc/davinci/Kconfig" | 33 | source "sound/soc/davinci/Kconfig" |
33 | source "sound/soc/omap/Kconfig" | 34 | source "sound/soc/omap/Kconfig" |
35 | source "sound/soc/blackfin/Kconfig" | ||
34 | 36 | ||
35 | # Supported codecs | 37 | # Supported codecs |
36 | source "sound/soc/codecs/Kconfig" | 38 | source "sound/soc/codecs/Kconfig" |