[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 b65ee4701f98fab7d6564d9cee6d771455aa3603..d8f11408ce274a2b2c67256d0ec07d3c3a828bdd 100644 (file)
--- 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 a5d593c66f9fca6b05ebade6a33d873dfba89397..d140e93d37b6df16ffc7ccb2a3e222992891dbbe 100644 (file)
--- 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