[PATCH] alsa before oss in Kconfig

  Move ALSA before OSS

diff --git a/arch/i386/defconfig b/arch/i386/defconfig
index 869f19867f7f752716d9996c7bcb8bb77966e6c4..8cae61a843aeb5f01dfd70452dd994047592881b 100644 (file)
--- a/arch/i386/defconfig
+++ b/arch/i386/defconfig
@@ -838,11 +838,6 @@ CONFIG_DUMMY_CONSOLE=y
 #
 CONFIG_SOUND=y
 
-#
-# Open Sound System
-#
-# CONFIG_SOUND_PRIME is not set
-
 #
 # Advanced Linux Sound Architecture
 #
@@ -923,6 +918,11 @@ CONFIG_SND_INTEL8X0=y
 #
 # CONFIG_SND_USB_AUDIO is not set
 
+#
+# Open Sound System
+#
+# CONFIG_SOUND_PRIME is not set
+
 #
 # USB support
 #

diff --git a/arch/ia64/defconfig b/arch/ia64/defconfig
index 7c4f8c633edc2010836980500d59044db22b24a3..e239ef34b353e0b521540dd5fa94c5d7b6ce5e86 100644 (file)
--- a/arch/ia64/defconfig
+++ b/arch/ia64/defconfig
@@ -656,6 +656,11 @@ CONFIG_VGA_CONSOLE=y
 #
 CONFIG_SOUND=y
 
+#
+# Advanced Linux Sound Architecture
+#
+# CONFIG_SND is not set
+
 #
 # Open Sound System
 #
@@ -680,11 +685,6 @@ CONFIG_SOUND_CS4281=y
 # CONFIG_SOUND_OSS is not set
 # CONFIG_SOUND_TVMIXER is not set
 
-#
-# Advanced Linux Sound Architecture
-#
-# CONFIG_SND is not set
-
 #
 # USB support
 #

diff --git a/arch/parisc/defconfig b/arch/parisc/defconfig
index 9244c80442b621b44d4cdf27d0c3f11bc0f4a998..bcc94fed0de018ea1929a5865f18c6d185d67e8c 100644 (file)
--- 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 e27f9d68019a69321b69e566dd48d37fdb82c9ae..8a422c525247d7a7b037db7898078e156349fa38 100644 (file)
--- a/arch/sparc64/defconfig
+++ b/arch/sparc64/defconfig
@@ -714,11 +714,6 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 #
 CONFIG_SOUND=m
 
-#
-# Open Sound System
-#
-# CONFIG_SOUND_PRIME is not set
-
 #
 # Advanced Linux Sound Architecture
 #
@@ -783,6 +778,11 @@ CONFIG_SND_SONICVIBES=m
 CONFIG_SND_SUN_AMD7930=m
 CONFIG_SND_SUN_CS4231=m
 
+#
+# Open Sound System
+#
+# CONFIG_SOUND_PRIME is not set
+
 #
 # USB support
 #

diff --git a/sound/Kconfig b/sound/Kconfig
index 0955202c77341198d8aacc505c76b0167cf4a4bf..230d19bf26df73a2961b6321ed76025d98ac6129 100644 (file)
--- 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