Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

[linux.git] / sound / Kconfig

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


@@ -66,6 +58,8 @@ source "sound/pci/Kconfig"
 
 source "sound/ppc/Kconfig"
 
 
 source "sound/ppc/Kconfig"
 

+source "sound/aoa/Kconfig"
+

 source "sound/arm/Kconfig"
 
 source "sound/mips/Kconfig"
 source "sound/arm/Kconfig"
 
 source "sound/mips/Kconfig"