Merge branch '85xx' into for_paulus

[linux-2.6-omap-h63xx.git] / sound / Kconfig

diff --git a/sound/Kconfig b/sound/Kconfig
index d8f11408ce274a2b2c67256d0ec07d3c3a828bdd..95949b6806acbdf9580b23b10e5e9cac8722df3e 100644 (file)
--- a/sound/Kconfig
+++ b/sound/Kconfig
@@ -48,14 +48,6 @@ config SND
 
          For more information, see <http://www.alsa-project.org/>
 
-config SND_AC97_CODEC
-       tristate
-       select SND_PCM
-       select SND_AC97_BUS
-
-config SND_AC97_BUS
-       tristate
-
 source "sound/core/Kconfig"
 
 source "sound/drivers/Kconfig"
@@ -66,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"