summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Dunlap <rdunlap@xenotime.net>2005-09-30 16:55:14 +0200
committerJaroslav Kysela <perex@suse.cz>2005-11-04 13:17:08 +0100
commit4b0940f8117b6cdf7e7c27bdecc29931f18c81ed (patch)
tree4effa4548b4d4041f421b7f693840bfac1fa8f47
parent2ba71978c04d4dba983b4fc658f82eae164c2bca (diff)
downloadop-kernel-dev-4b0940f8117b6cdf7e7c27bdecc29931f18c81ed.zip
op-kernel-dev-4b0940f8117b6cdf7e7c27bdecc29931f18c81ed.tar.gz
[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>
-rw-r--r--sound/Kconfig8
-rw-r--r--sound/pci/Kconfig8
2 files changed, 8 insertions, 8 deletions
diff --git a/sound/Kconfig b/sound/Kconfig
index b65ee47..d8f1140 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 a5d593c..d140e93 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
OpenPOWER on IntegriCloud