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

[Bastian Blank]

Author: waldi
Date: Fri Sep 28 11:02:52 2007
New Revision: 9584

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


Added:
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-bnx2-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	Fri Sep 28 11:02:52 2007
@@ -64,6 +64,7 @@
     - Madge Ambassador (Collage PCI 155 Server)
     - PCA-200E support
     - SBA-200E support
+    - Broadcom NetXtremeII support
   * Disable now broken drivers:
     - Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support
     - Broadcom Tigon3 support
@@ -76,6 +77,7 @@
     - Madge Ambassador (Collage PCI 155 Server)
     - PCA-200E support
     - SBA-200E support
+    - Broadcom NetXtremeII support
   * Add -common to common header package names.
   * Drop provides from common header packages.
 

Added: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-bnx2-disable.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-bnx2-disable.patch	Fri Sep 28 11:02:52 2007
@@ -0,0 +1,6 @@
+--- a/drivers/net/Kconfig
++++ b/drivers/net/Kconfig
+@@ -2327,2 +2327,3 @@ config BNX2
+ 	tristate "Broadcom NetXtremeII support"
++	depends on BROKEN
+ 	depends on PCI

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	Fri Sep 28 11:02:52 2007
@@ -26,6 +26,9 @@
 rm drivers/net/appletalk/cops_ffdrv.h
 rm drivers/net/appletalk/cops_ltdrv.h
 
+rm drivers/net/bnx2_fw.h
+rm drivers/net/bnx2_fw2.h
+
 rm drivers/net/dgrs.c
 rm drivers/net/dgrs.h
 rm drivers/net/dgrs_asstruct.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	Fri Sep 28 11:02:52 2007
@@ -3,6 +3,7 @@
 + debian/dfsg/drivers-media-dvb-ttusb-budget.patch
 + debian/dfsg/drivers-media-video-dabus.patch
 + debian/dfsg/drivers-net-acenic-remove.patch
++ debian/dfsg/drivers-net-bnx2-disable.patch
 + debian/dfsg/drivers-net-appletalk-cops.patch
 + debian/dfsg/drivers-net-dgrs.patch
 + debian/dfsg/drivers-net-hamradio-yam.patch