Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[pandora-kernel.git] / sound / Kconfig

diff --git a/sound/Kconfig b/sound/Kconfig
index d8f1140..b65ee47 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"