diff --git a/[refs] b/[refs]
index a6a23acfa8a6..2a644f954d18 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 954fa19ab7a14c3f54044780a90cd6a95149f90b
+refs/heads/master: 9056412f21bb6b76ceb98329409a958198b2d591
diff --git a/trunk/sound/Kconfig b/trunk/sound/Kconfig
index d8f11408ce27..b65ee4701f98 100644
--- a/trunk/sound/Kconfig
+++ b/trunk/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"
diff --git a/trunk/sound/drivers/Kconfig b/trunk/sound/drivers/Kconfig
index d008855cf9a0..395c4ef52ac9 100644
--- a/trunk/sound/drivers/Kconfig
+++ b/trunk/sound/drivers/Kconfig
@@ -23,6 +23,14 @@ config SND_VX_LIB
 	select SND_HWDEP
 	select SND_PCM
 
+config SND_AC97_CODEC
+	tristate
+	select SND_PCM
+	select SND_AC97_BUS
+
+config SND_AC97_BUS
+	tristate
+
 
 config SND_DUMMY
 	tristate "Dummy (/dev/null) soundcard"