summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Dunlap <rdunlap@xenotime.net>2005-11-29 14:48:41 +0100
committerJaroslav Kysela <perex@suse.cz>2006-01-03 12:29:56 +0100
commit9056412f21bb6b76ceb98329409a958198b2d591 (patch)
tree4184fda7122d5160b36e2cd5ac7d8d901973f934
parent954fa19ab7a14c3f54044780a90cd6a95149f90b (diff)
downloadop-kernel-dev-9056412f21bb6b76ceb98329409a958198b2d591.zip
op-kernel-dev-9056412f21bb6b76ceb98329409a958198b2d591.tar.gz
[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>
-rw-r--r--sound/Kconfig8
-rw-r--r--sound/drivers/Kconfig8
2 files changed, 8 insertions, 8 deletions
diff --git a/sound/Kconfig b/sound/Kconfig
index d8f1140..b65ee47 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 d008855..395c4ef 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"
OpenPOWER on IntegriCloud