From: Randy Dunlap <rdunlap@xenotime.net>
Date: Tue, 29 Nov 2005 13:48:41 +0000 (+0100)
Subject: [ALSA] sound: align device drivers menus
X-Git-Tag: v2.6.16-rc1~474^2~22^2~3^2~57
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9056412f21bb6b76ceb98329409a958198b2d591;p=linux-2.6-omap-h63xx.git

[ALSA] sound: align device drivers menus

Modules: Sound Core,Generic drivers

AC97 Kconfig entries broke the ALSA device drivers menu, so move them to a
location where that won't happen, enabling all device sub-menus to be
presented together.

Fixed for the latest ALSA tree by Takashi Iwai <tiwai@suse.de>.

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/Kconfig b/sound/Kconfig
index d8f11408ce2..b65ee4701f9 100644
--- 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"
diff --git a/sound/drivers/Kconfig b/sound/drivers/Kconfig
index d008855cf9a..395c4ef52ac 100644
--- a/sound/drivers/Kconfig
+++ b/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"