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

[Bastian Blank]

Author: waldi
Date: Mon Feb 18 21:28:39 2008
New Revision: 10575

Log:
* debian/changelog: Update.
* debian/patches/debian/dfsg/files-1: Remove drivers/net/bnx2x_init_values.h.
* debian/patches/debian/dfsg/drivers-net-bnx2x-disable.patch: Add.
* debian/patches/series/orig-0: Update.


Added:
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-bnx2x-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	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Mon Feb 18 21:28:39 2008
@@ -45,6 +45,12 @@
   * [mips/mipsel] Enable CONFIG_NO_HZ, CONFIG_HIGH_RES_TIMERS for dynticks
     and true high-resolution timers on 4kc-malta and 5kc-malta flavours.
 
+  [ Bastian Blank ]
+  * Remove binary only firmwares for:
+    - Broadcom NetXtremeII 10Gb support
+  * Disable now broken drivers:
+    - Broadcom NetXtremeII 10Gb support
+
  -- Gordon Farquharson <gordonfarquharson at gmail.com>  Thu, 14 Feb 2008 00:25:23 -0700
 
 linux-2.6 (2.6.24-2) UNRELEASED; urgency=low

Added: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-bnx2x-disable.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-bnx2x-disable.patch	Mon Feb 18 21:28:39 2008
@@ -0,0 +1,8 @@
+--- a/drivers/net/Kconfig
++++ b/drivers/net/Kconfig
+@@ -2661,4 +2661,5 @@
+ config BNX2X
+ 	tristate "Broadcom NetXtremeII 10Gb support"
++	depends on BROKEN
+ 	depends on PCI
+ 	select ZLIB_INFLATE

Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1	(original)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1	Mon Feb 18 21:28:39 2008
@@ -25,6 +25,8 @@
 rm drivers/net/bnx2_fw.h
 rm drivers/net/bnx2_fw2.h
 
+rm drivers/net/bnx2x_init_values.h
+
 rm drivers/net/hamradio/yam1200.h
 rm drivers/net/hamradio/yam9600.h
 

Modified: dists/trunk/linux-2.6/debian/patches/series/orig-0
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/orig-0	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/orig-0	Mon Feb 18 21:28:39 2008
@@ -6,6 +6,7 @@
 + debian/dfsg/drivers-media-video-dabus-license.patch
 + debian/dfsg/drivers-net-acenic-remove.patch
 + debian/dfsg/drivers-net-bnx2-disable.patch
++ debian/dfsg/drivers-net-bnx2x-disable.patch
 + debian/dfsg/drivers-net-appletalk-cops.patch
 + debian/dfsg/drivers-net-hamradio-yam.patch
 + debian/dfsg/drivers-net-myri.patch