From: Randy Dunlap <rdunlap@xenotime.net>
Date: Fri, 30 Sep 2005 14:55:14 +0000 (+0200)
Subject: [ALSA] sound: align device drivers menus
X-Git-Tag: v2.6.15-rc1~451^2~63
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b0940f8117b6cdf7e7c27bdecc29931f18c81ed;p=linux-2.6

[ALSA] sound: align device drivers menus

Modules: Sound Core,PCI 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.

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 b65ee4701f..d8f11408ce 100644
--- a/sound/Kconfig
+++ b/sound/Kconfig
@@ -48,6 +48,14 @@ 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/pci/Kconfig b/sound/pci/Kconfig
index a5d593c66f..d140e93d37 100644
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -1,13 +1,5 @@
 # ALSA PCI drivers
 
-config SND_AC97_CODEC
-	tristate
-	select SND_PCM
-	select SND_AC97_BUS
-
-config SND_AC97_BUS
-	tristate
-
 menu "PCI devices"
 	depends on SND!=n && PCI