diff --git a/debian/changelog b/debian/changelog index 346146146..6bdd801c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,7 +8,8 @@ linux-2.6 (2.6.27~rc3-1~experimental.1) UNRELEASED; urgency=low [ 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. diff --git a/debian/config/mips/config.r4k-ip22 b/debian/config/mips/config.r4k-ip22 index 57cc1263c..f5c27dff8 100644 --- a/debian/config/mips/config.r4k-ip22 +++ b/debian/config/mips/config.r4k-ip22 @@ -587,7 +587,7 @@ CONFIG_FLATMEM_MANUAL=y ## ## file: sound/Kconfig ## -CONFIG_SOUND_PRIME=m +CONFIG_SND=m ## ## file: sound/core/Kconfig @@ -601,6 +601,12 @@ CONFIG_SND_SUPPORT_OLD_API=y # CONFIG_SND_VERBOSE_PRINTK is not set # CONFIG_SND_DEBUG is not set +## +## file: sound/mips/Kconfig +## +CONFIG_SND_MIPS=y +CONFIG_SND_SGI_HAL2=m + ## ## file: sound/drivers/Kconfig ## @@ -609,10 +615,3 @@ CONFIG_SND_SUPPORT_OLD_API=y # 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 -