diff options
| author | James H. Cloos Jr. <cloos@jhcloos.com> | 2003-01-15 16:41:32 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-01-15 16:41:32 -0800 |
| commit | 235b96072eaa00820f53ff0df2991ea0fbe3dbcc (patch) | |
| tree | a61064dfc18ee90cc064b56e740be901ca2d1da2 | |
| parent | db9a17287ab39faaa30b76b85a0947bdaa25db29 (diff) | |
[PATCH] alsa before oss in Kconfig
Move ALSA before OSS
| -rw-r--r-- | arch/i386/defconfig | 10 | ||||
| -rw-r--r-- | arch/ia64/defconfig | 10 | ||||
| -rw-r--r-- | arch/parisc/defconfig | 8 | ||||
| -rw-r--r-- | arch/sparc64/defconfig | 10 | ||||
| -rw-r--r-- | sound/Kconfig | 26 |
5 files changed, 31 insertions, 33 deletions
diff --git a/arch/i386/defconfig b/arch/i386/defconfig index 869f19867f7f..8cae61a843ae 100644 --- a/arch/i386/defconfig +++ b/arch/i386/defconfig @@ -839,11 +839,6 @@ CONFIG_DUMMY_CONSOLE=y CONFIG_SOUND=y # -# Open Sound System -# -# CONFIG_SOUND_PRIME is not set - -# # Advanced Linux Sound Architecture # CONFIG_SND=y @@ -924,6 +919,11 @@ CONFIG_SND_INTEL8X0=y # CONFIG_SND_USB_AUDIO is not set # +# Open Sound System +# +# CONFIG_SOUND_PRIME is not set + +# # USB support # CONFIG_USB=y diff --git a/arch/ia64/defconfig b/arch/ia64/defconfig index 7c4f8c633edc..e239ef34b353 100644 --- a/arch/ia64/defconfig +++ b/arch/ia64/defconfig @@ -657,6 +657,11 @@ CONFIG_VGA_CONSOLE=y CONFIG_SOUND=y # +# Advanced Linux Sound Architecture +# +# CONFIG_SND is not set + +# # Open Sound System # CONFIG_SOUND_PRIME=y @@ -681,11 +686,6 @@ CONFIG_SOUND_CS4281=y # CONFIG_SOUND_TVMIXER is not set # -# Advanced Linux Sound Architecture -# -# CONFIG_SND is not set - -# # USB support # CONFIG_USB=y diff --git a/arch/parisc/defconfig b/arch/parisc/defconfig index 9244c80442b6..bcc94fed0de0 100644 --- a/arch/parisc/defconfig +++ b/arch/parisc/defconfig @@ -643,14 +643,14 @@ CONFIG_FONT_8x16=y CONFIG_SOUND=y # -# Open Sound System +# Advanced Linux Sound Architecture # -# CONFIG_SOUND_PRIME is not set +# CONFIG_SND is not set # -# Advanced Linux Sound Architecture +# Open Sound System # -# CONFIG_SND is not set +# CONFIG_SOUND_PRIME is not set # # USB support diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig index e27f9d68019a..8a422c525247 100644 --- a/arch/sparc64/defconfig +++ b/arch/sparc64/defconfig @@ -715,11 +715,6 @@ CONFIG_NLS_DEFAULT="iso8859-1" CONFIG_SOUND=m # -# Open Sound System -# -# CONFIG_SOUND_PRIME is not set - -# # Advanced Linux Sound Architecture # CONFIG_SND=m @@ -784,6 +779,11 @@ CONFIG_SND_SUN_AMD7930=m CONFIG_SND_SUN_CS4231=m # +# Open Sound System +# +# CONFIG_SOUND_PRIME is not set + +# # USB support # CONFIG_USB=y diff --git a/sound/Kconfig b/sound/Kconfig index 0955202c7734..230d19bf26df 100644 --- a/sound/Kconfig +++ b/sound/Kconfig @@ -1,20 +1,6 @@ # sound/Config.in # -menu "Open Sound System" - depends on SOUND!=n - -config SOUND_PRIME - tristate "Open Sound System" - depends on SOUND - help - Say 'Y' or 'M' to enable Open Sound System drivers. - -source "sound/oss/Kconfig" - -endmenu - - menu "Advanced Linux Sound Architecture" depends on SOUND!=n @@ -42,3 +28,15 @@ source "sound/sparc/Kconfig" endmenu +menu "Open Sound System" + depends on SOUND!=n + +config SOUND_PRIME + tristate "Open Sound System (DEPRECATED)" + depends on SOUND + help + Say 'Y' or 'M' to enable Open Sound System drivers. + +source "sound/oss/Kconfig" + +endmenu |