* 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.

svn path=/dists/trunk/linux-2.6/; revision=10575

debian/changelog

@@ -45,6 +45,12 @@ linux-2.6 (2.6.25~rc2-1~experimental.1) UNRELEASED; urgency=low
   * [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@gmail.com>  Thu, 14 Feb 2008 00:25:23 -0700
 
 linux-2.6 (2.6.24-2) UNRELEASED; urgency=low

debian/patches/debian/dfsg/drivers-net-bnx2x-disable.patch

@@ -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

debian/patches/debian/dfsg/files-1

@@ -25,6 +25,8 @@ rm drivers/net/appletalk/cops_ltdrv.h
 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
 

debian/patches/series/orig-0

@@ -6,6 +6,7 @@ X debian/dfsg/files-1
 + 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