From 4e14cd83476439625a138b6b5ac8914ed999e7a2 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Fri, 27 Nov 2009 16:28:11 +0000 Subject: [PATCH] * debian/changelog: Update. * debian/config/mips/config.r5k-ip32: - Remove SOUND_PRIME. - Remove remaining OSS drivers. svn path=/dists/trunk/linux-2.6/; revision=14686 --- debian/changelog | 3 ++- debian/config/mips/config.4kc-malta | 11 ----------- debian/config/mips/config.5kc-malta | 11 ----------- debian/config/mips/config.r5k-ip32 | 10 ---------- debian/config/mips/config.sb1-bcm91250a | 12 ------------ debian/config/mips/config.sb1a-bcm91480b | 11 ----------- 6 files changed, 2 insertions(+), 56 deletions(-) diff --git a/debian/changelog b/debian/changelog index a8a6a8bc9..8c3c72439 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ linux-2.6 (2.6.32~rc8-1~experimental.2) UNRELEASED; urgency=low * New upstream release candidate: - Fixes wifi with rt73usb (Closes: #555640) - + [ Martin Michlmayr ] * [armel/kirkwood] Turn on USB_SUSPEND (on the request of a SheevaPlug user). @@ -10,6 +10,7 @@ linux-2.6 (2.6.32~rc8-1~experimental.2) UNRELEASED; urgency=low [ Bastian Blank ] * Enable PCI_MSI. * [powerpc] Properly enable Apple PMU battery. + * [mips/mipsel] Drop remaining OSS drivers. -- Martin Michlmayr Sun, 22 Nov 2009 13:56:12 +0000 diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta index eb007eac1..404641721 100644 --- a/debian/config/mips/config.4kc-malta +++ b/debian/config/mips/config.4kc-malta @@ -1525,7 +1525,6 @@ CONFIG_X25=m ## file: sound/Kconfig ## CONFIG_SOUND=y -CONFIG_SOUND_PRIME=m ## ## file: sound/core/Kconfig @@ -1555,16 +1554,6 @@ CONFIG_SND_SERIAL_U16550=m CONFIG_SND_MPU401=m CONFIG_SND_AC97_POWER_SAVE=y -## -## file: sound/oss/Kconfig -## -CONFIG_SOUND_MSNDCLAS=m -CONFIG_MSNDCLAS_INIT_FILE="/etc/sound/msndinit.bin" -CONFIG_MSNDCLAS_PERM_FILE="/etc/sound/msndperm.bin" -CONFIG_SOUND_MSNDPIN=m -CONFIG_MSNDPIN_INIT_FILE="/etc/sound/pndspini.bin" -CONFIG_MSNDPIN_PERM_FILE="/etc/sound/pndsperm.bin" - ## ## file: sound/pci/Kconfig ## diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta index 2fd3b0b25..b7e346c5b 100644 --- a/debian/config/mips/config.5kc-malta +++ b/debian/config/mips/config.5kc-malta @@ -1825,7 +1825,6 @@ CONFIG_X25=m ## file: sound/Kconfig ## CONFIG_SOUND=y -CONFIG_SOUND_PRIME=m ## ## file: sound/core/Kconfig @@ -1856,16 +1855,6 @@ CONFIG_SND_MPU401=m CONFIG_SND_PORTMAN2X4=m CONFIG_SND_AC97_POWER_SAVE=y -## -## file: sound/oss/Kconfig -## -CONFIG_SOUND_MSNDCLAS=m -CONFIG_MSNDCLAS_INIT_FILE="/etc/sound/msndinit.bin" -CONFIG_MSNDCLAS_PERM_FILE="/etc/sound/msndperm.bin" -CONFIG_SOUND_MSNDPIN=m -CONFIG_MSNDPIN_INIT_FILE="/etc/sound/pndspini.bin" -CONFIG_MSNDPIN_PERM_FILE="/etc/sound/pndsperm.bin" - ## ## file: sound/pci/Kconfig ## diff --git a/debian/config/mips/config.r5k-ip32 b/debian/config/mips/config.r5k-ip32 index 64d2e9994..1f289b1c4 100644 --- a/debian/config/mips/config.r5k-ip32 +++ b/debian/config/mips/config.r5k-ip32 @@ -697,16 +697,6 @@ CONFIG_SND_SUPPORT_OLD_API=y CONFIG_SND_MIPS=y CONFIG_SND_SGI_O2=m -## -## file: sound/oss/Kconfig -## -# CONFIG_SOUND_MSNDCLAS is not set -CONFIG_MSNDCLAS_INIT_FILE="/etc/sound/msndinit.bin" -CONFIG_MSNDCLAS_PERM_FILE="/etc/sound/msndperm.bin" -# CONFIG_SOUND_MSNDPIN is not set -CONFIG_MSNDPIN_INIT_FILE="/etc/sound/pndspini.bin" -CONFIG_MSNDPIN_PERM_FILE="/etc/sound/pndsperm.bin" - ## ## file: sound/pci/Kconfig ## diff --git a/debian/config/mips/config.sb1-bcm91250a b/debian/config/mips/config.sb1-bcm91250a index 28b393855..3dd31e51d 100644 --- a/debian/config/mips/config.sb1-bcm91250a +++ b/debian/config/mips/config.sb1-bcm91250a @@ -900,7 +900,6 @@ CONFIG_IP_PNP_BOOTP=y ## file: sound/Kconfig ## CONFIG_SOUND=y -CONFIG_SOUND_PRIME=y ## ## file: sound/core/Kconfig @@ -925,17 +924,6 @@ CONFIG_SND_VIRMIDI=m # CONFIG_SND_SERIAL_U16550 is not set # CONFIG_SND_MPU401 is not set -## -## file: sound/oss/Kconfig -## -# CONFIG_SOUND_BCM_CS4297A is not set -# CONFIG_SOUND_MSNDCLAS is not set -CONFIG_MSNDCLAS_INIT_FILE="/etc/sound/msndinit.bin" -CONFIG_MSNDCLAS_PERM_FILE="/etc/sound/msndperm.bin" -# CONFIG_SOUND_MSNDPIN is not set -CONFIG_MSNDPIN_INIT_FILE="/etc/sound/pndspini.bin" -CONFIG_MSNDPIN_PERM_FILE="/etc/sound/pndsperm.bin" - ## ## file: sound/pci/Kconfig ## diff --git a/debian/config/mips/config.sb1a-bcm91480b b/debian/config/mips/config.sb1a-bcm91480b index e3e6c2b48..bd1bb2f28 100644 --- a/debian/config/mips/config.sb1a-bcm91480b +++ b/debian/config/mips/config.sb1a-bcm91480b @@ -930,7 +930,6 @@ CONFIG_IP_PNP_BOOTP=y ## file: sound/Kconfig ## CONFIG_SOUND=y -CONFIG_SOUND_PRIME=y ## ## file: sound/core/Kconfig @@ -955,16 +954,6 @@ CONFIG_SND_VIRMIDI=m CONFIG_SND_SERIAL_U16550=m # CONFIG_SND_MPU401 is not set -## -## file: sound/oss/Kconfig -## -# CONFIG_SOUND_MSNDCLAS is not set -CONFIG_MSNDCLAS_INIT_FILE="/etc/sound/msndinit.bin" -CONFIG_MSNDCLAS_PERM_FILE="/etc/sound/msndperm.bin" -# CONFIG_SOUND_MSNDPIN is not set -CONFIG_MSNDPIN_INIT_FILE="/etc/sound/pndspini.bin" -CONFIG_MSNDPIN_PERM_FILE="/etc/sound/pndsperm.bin" - ## ## file: sound/pci/Kconfig ##