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

Fri Nov 27 16:28:13 UTC 2009

Author: waldi
Date: Fri Nov 27 16:28:11 2009
New Revision: 14686

Log:
* debian/changelog: Update.
* debian/config/mips/config.r5k-ip32:
  - Remove SOUND_PRIME.
  - Remove remaining OSS drivers.

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
   dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
   dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32
   dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a
   dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================

--- dists/trunk/linux-2.6/debian/changelog	Fri Nov 27 16:23:41 2009	(r14685)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Nov 27 16:28:11 2009	(r14686)
@@ -2,7 +2,7 @@
 
   * 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 @@
   [ Bastian Blank ]
   * Enable PCI_MSI.
   * [powerpc] Properly enable Apple PMU battery.
+  * [mips/mipsel] Drop remaining OSS drivers.
 
  -- Martin Michlmayr <tbm at cyrius.com>  Sun, 22 Nov 2009 13:56:12 +0000
 

Modified: dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta	Fri Nov 27 16:23:41 2009	(r14685)
+++ dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta	Fri Nov 27 16:28:11 2009	(r14686)
@@ -1525,7 +1525,6 @@
 ## file: sound/Kconfig
 ##
 CONFIG_SOUND=y
-CONFIG_SOUND_PRIME=m
 
 ##
 ## file: sound/core/Kconfig
@@ -1556,16 +1555,6 @@
 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
 ##
 CONFIG_SND_AD1889=m

Modified: dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta	Fri Nov 27 16:23:41 2009	(r14685)
+++ dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta	Fri Nov 27 16:28:11 2009	(r14686)
@@ -1825,7 +1825,6 @@
 ## file: sound/Kconfig
 ##
 CONFIG_SOUND=y
-CONFIG_SOUND_PRIME=m
 
 ##
 ## file: sound/core/Kconfig
@@ -1857,16 +1856,6 @@
 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
 ##
 CONFIG_SND_AD1889=m

Modified: dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32	Fri Nov 27 16:23:41 2009	(r14685)
+++ dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32	Fri Nov 27 16:28:11 2009	(r14686)
@@ -698,16 +698,6 @@
 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
 ##
 # CONFIG_SND_AD1889 is not set

Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a	Fri Nov 27 16:23:41 2009	(r14685)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a	Fri Nov 27 16:28:11 2009	(r14686)
@@ -900,7 +900,6 @@
 ## file: sound/Kconfig
 ##
 CONFIG_SOUND=y
-CONFIG_SOUND_PRIME=y
 
 ##
 ## file: sound/core/Kconfig
@@ -926,17 +925,6 @@
 # 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
 ##
 CONFIG_SND_AD1889=m

Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b	Fri Nov 27 16:23:41 2009	(r14685)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b	Fri Nov 27 16:28:11 2009	(r14686)
@@ -930,7 +930,6 @@
 ## file: sound/Kconfig
 ##
 CONFIG_SOUND=y
-CONFIG_SOUND_PRIME=y
 
 ##
 ## file: sound/core/Kconfig
@@ -956,16 +955,6 @@
 # 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
 ##
 CONFIG_SND_AD1889=m

