Pull bugzilla-7897 into release branch

[sfrench/cifs-2.6.git] / sound / Kconfig

diff --git a/sound/Kconfig b/sound/Kconfig
index b65ee4701f98fab7d6564d9cee6d771455aa3603..97532bbc2ccba8fb301a6dfdd9991a3694012381 100644 (file)
--- a/sound/Kconfig
+++ b/sound/Kconfig
@@ -58,15 +58,17 @@ source "sound/pci/Kconfig"
 
 source "sound/ppc/Kconfig"
 
+source "sound/aoa/Kconfig"
+
 source "sound/arm/Kconfig"
 
 source "sound/mips/Kconfig"
 
-# the following will depenend on the order of config.
+# the following will depend on the order of config.
 # here assuming USB is defined before ALSA
 source "sound/usb/Kconfig"
 
-# the following will depenend on the order of config.
+# the following will depend on the order of config.
 # here assuming PCMCIA is defined before ALSA
 source "sound/pcmcia/Kconfig"
 
@@ -74,6 +76,8 @@ source "sound/sparc/Kconfig"
 
 source "sound/parisc/Kconfig"
 
+source "sound/soc/Kconfig"
+
 endmenu
 
 menu "Open Sound System"
@@ -91,4 +95,12 @@ endmenu
 
 endif
 
+config AC97_BUS
+       tristate
+       help
+         This is used to avoid config and link hard dependencies between the
+         sound subsystem and other function drivers completely unrelated to
+         sound although they're sharing the AC97 bus. Concerned drivers
+         should "select" this.
+
 endmenu