[PATCH] alsa before oss in Kconfig

  Move ALSA before OSS

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
 #

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
 #

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

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
 #

sound/Kconfig

 # 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