diff options
author | Randy Dunlap <rdunlap@xenotime.net> | 2005-11-29 08:48:41 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-03 06:29:56 -0500 |
commit | 9056412f21bb6b76ceb98329409a958198b2d591 (patch) | |
tree | 4184fda7122d5160b36e2cd5ac7d8d901973f934 /sound | |
parent | 954fa19ab7a14c3f54044780a90cd6a95149f90b (diff) |
[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>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/Kconfig | 8 | ||||
-rw-r--r-- | sound/drivers/Kconfig | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sound/Kconfig b/sound/Kconfig index d8f11408ce27..b65ee4701f98 100644 --- a/sound/Kconfig +++ b/sound/Kconfig | |||
@@ -48,14 +48,6 @@ config SND | |||
48 | 48 | ||
49 | For more information, see <http://www.alsa-project.org/> | 49 | For more information, see <http://www.alsa-project.org/> |
50 | 50 | ||
51 | config SND_AC97_CODEC | ||
52 | tristate | ||
53 | select SND_PCM | ||
54 | select SND_AC97_BUS | ||
55 | |||
56 | config SND_AC97_BUS | ||
57 | tristate | ||
58 | |||
59 | source "sound/core/Kconfig" | 51 | source "sound/core/Kconfig" |
60 | 52 | ||
61 | source "sound/drivers/Kconfig" | 53 | source "sound/drivers/Kconfig" |
diff --git a/sound/drivers/Kconfig b/sound/drivers/Kconfig index d008855cf9a0..395c4ef52ac9 100644 --- a/sound/drivers/Kconfig +++ b/sound/drivers/Kconfig | |||
@@ -23,6 +23,14 @@ config SND_VX_LIB | |||
23 | select SND_HWDEP | 23 | select SND_HWDEP |
24 | select SND_PCM | 24 | select SND_PCM |
25 | 25 | ||
26 | config SND_AC97_CODEC | ||
27 | tristate | ||
28 | select SND_PCM | ||
29 | select SND_AC97_BUS | ||
30 | |||
31 | config SND_AC97_BUS | ||
32 | tristate | ||
33 | |||
26 | 34 | ||
27 | config SND_DUMMY | 35 | config SND_DUMMY |
28 | tristate "Dummy (/dev/null) soundcard" | 36 | tristate "Dummy (/dev/null) soundcard" |