[kernel] r12061 - in dists/trunk/linux-2.6/debian: . config/mips

[Martin Michlmayr]

Author: tbm
Date: Wed Aug 13 13:04:48 2008
New Revision: 12061

Log:
Enable the new ALSA sound driver (SND_SGI_HAL2).


Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Wed Aug 13 13:04:48 2008
@@ -8,7 +8,8 @@
   [ Martin Michlmayr ]
   * [mips/r4k-ip22, mips/sb1-bcm91250a] Don't build in ISO9660.
   * [mipsel/r5k-cobalt] Enable INPUT_COBALT_BTNS.
-  * [mipsel/r5k-cobalt] Enable the new Cobalt LCD driver FB_COBALT.
+  * [mipsel/r5k-cobalt] Enable the new Cobalt LCD driver (FB_COBALT).
+  * [mips/r4k-ip22] Enable the new ALSA sound driver (SND_SGI_HAL2).
 
   [ Ian Campbell ]
   * [x86]: Enable Xen guest support in amd64 flavour.

Modified: dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22	(original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22	Wed Aug 13 13:04:48 2008
@@ -587,7 +587,7 @@
 ##
 ## file: sound/Kconfig
 ##
-CONFIG_SOUND_PRIME=m
+CONFIG_SND=m
 
 ##
 ## file: sound/core/Kconfig
@@ -602,6 +602,12 @@
 # CONFIG_SND_DEBUG is not set
 
 ##
+## file: sound/mips/Kconfig
+##
+CONFIG_SND_MIPS=y
+CONFIG_SND_SGI_HAL2=m
+
+##
 ## file: sound/drivers/Kconfig
 ##
 # CONFIG_SND_DUMMY is not set
@@ -609,10 +615,3 @@
 # CONFIG_SND_SERIAL_U16550 is not set
 # CONFIG_SND_MPU401 is not set
 
-##
-## file: sound/oss/Kconfig
-##
-CONFIG_SOUND_HAL2=m
-# CONFIG_SOUND_MSNDCLAS is not set
-# CONFIG_SOUND_MSNDPIN is not set
-