[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 d8f11408ce274a2b2c67256d0ec07d3c3a828bdd..b65ee4701f98fab7d6564d9cee6d771455aa3603 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"

diff --git a/sound/drivers/Kconfig b/sound/drivers/Kconfig
index d008855cf9a03f0fbf6685d97216ef405e143dee..395c4ef52ac9b04e7d5e288090d6153182353984 100644 (file)
--- 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"