[kernel] r13416 - in dists/trunk/linux-2.6/debian: . patches/debian/dfsg patches/series

[Ben Hutchings]

Author: benh
Date: Mon Apr 13 04:06:50 2009
New Revision: 13416

Log:
Remove firmware for enp2611_mod and rt3070sta; mark the drivers broken

Added:
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-ixp2000-disable.patch
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rt3070-disable.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
   dists/trunk/linux-2.6/debian/patches/series/orig-0

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Mon Apr 13 03:47:54 2009	(r13415)
+++ dists/trunk/linux-2.6/debian/changelog	Mon Apr 13 04:06:50 2009	(r13416)
@@ -13,6 +13,7 @@
   * Remove firmware from driver/staging (closes: #521553)
     - make rt2860sta and rt2870sta use request_firmware(),
       thanks to Darren Salt
+  * Remove firmware from enp2611_mod (not included in Debian kernel images)
 
   [ Martin Michlmayr ]
   * [arm/orion5x] Enable CONFIG_SENSORS_G760A used on the D-Link DNS-323.

Added: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-ixp2000-disable.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-ixp2000-disable.patch	Mon Apr 13 04:06:50 2009	(r13416)
@@ -0,0 +1,11 @@
+diff --git a/drivers/net/ixp2000/Kconfig b/drivers/net/ixp2000/Kconfig
+index 2fec241..2c7f354 100644
+--- a/drivers/net/ixp2000/Kconfig
++++ b/drivers/net/ixp2000/Kconfig
+@@ -1,5 +1,6 @@
+ config ENP2611_MSF_NET
+ 	tristate "Radisys ENP2611 MSF network interface support"
++	depends on BROKEN
+ 	depends on ARCH_ENP2611
+ 	help
+ 	  This is a driver for the MSF network interface unit in

Added: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rt3070-disable.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rt3070-disable.patch	Mon Apr 13 04:06:50 2009	(r13416)
@@ -0,0 +1,11 @@
+diff --git a/drivers/staging/rt3070/Kconfig b/drivers/staging/rt3070/Kconfig
+index b37fb5d..e414305 100644
+--- a/drivers/staging/rt3070/Kconfig
++++ b/drivers/staging/rt3070/Kconfig
+@@ -1,5 +1,6 @@
+ config RT3070
+ 	tristate "Ralink 3070 wireless support"
++	depends on BROKEN
+ 	depends on USB && X86 && WLAN_80211
+ 	---help---
+ 	  This is an experimental driver for the Ralink 3070 wireless chip.

Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1	Mon Apr 13 03:47:54 2009	(r13415)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1	Mon Apr 13 04:06:50 2009	(r13416)
@@ -44,6 +44,8 @@
 
 rm drivers/net/bnx2x_init_values.h
 
+rm drivers/net/ixp2000/*.ucode
+
 rm drivers/staging/me4000/me*_firmware.h
 
 rm drivers/staging/otus/hal/hp*fw*.c
@@ -52,6 +54,8 @@
 
 rm drivers/staging/rt2870/common/firmware.h
 
+rm drivers/staging/rt3070/firmware.h
+
 rm drivers/staging/slicoss/*ucode.h
 
 rm sound/pci/cs46xx/cs46xx_image.h

Modified: dists/trunk/linux-2.6/debian/patches/series/orig-0
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/orig-0	Mon Apr 13 03:47:54 2009	(r13415)
+++ dists/trunk/linux-2.6/debian/patches/series/orig-0	Mon Apr 13 04:06:50 2009	(r13416)
@@ -3,10 +3,12 @@
 + debian/dfsg/drivers-gpu-drm-radeon-disable.patch
 + debian/dfsg/drivers-net-bnx2x-disable.patch
 + debian/dfsg/drivers-net-appletalk-cops.patch
++ debian/dfsg/drivers-net-ixp2000-disable.patch
 + debian/dfsg/drivers-staging-me4000-disable.patch                             
 + debian/dfsg/drivers-staging-otus-disable.patch                               
 + debian/dfsg/drivers-staging-rt2860-disable.patch                             
 + debian/dfsg/drivers-staging-rt2870-disable.patch                             
++ debian/dfsg/drivers-staging-rt3070-disable.patch                             
 + debian/dfsg/firmware-cleanup.patch
 + debian/dfsg/sound-pci.patch
 X debian/dfsg/files-1