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

[Bastian Blank]

Author: waldi
Date: Sat Sep 15 18:40:02 2007
New Revision: 9521

Log:
* debian/patches/debian/dfsg/drivers-net-tg3.patch: Add.
* debian/patches/debian/dfsg/files-1: Apply unifdef to tg3.
* debian/patches/series/orig-0: Update.


Added:
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-tg3.patch
Modified:
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
   dists/trunk/linux-2.6/debian/patches/series/orig-0

Added: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-tg3.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-tg3.patch	Sat Sep 15 18:40:02 2007
@@ -0,0 +1,46 @@
+diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
+index 5b9e17b..d6ba3a9 100644
+--- a/drivers/net/Kconfig
++++ b/drivers/net/Kconfig
+@@ -2229,6 +2229,7 @@ config VIA_VELOCITY
+ 
+ config TIGON3
+ 	tristate "Broadcom Tigon3 support"
++	depends on BROKEN
+ 	depends on PCI
+ 	help
+ 	  This driver supports Broadcom Tigon3 based gigabit Ethernet cards.
+diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
+index 9034a05..a3ad51e 100644
+--- a/drivers/net/tg3.c
++++ b/drivers/net/tg3.c
+@@ -5131,6 +5131,7 @@ static int tg3_halt(struct tg3 *tp, int kind, int silent)
+ 	return 0;
+ }
+ 
++#ifdef REMOVE_DFSG
+ #define TG3_FW_RELEASE_MAJOR	0x0
+ #define TG3_FW_RELASE_MINOR	0x0
+ #define TG3_FW_RELEASE_FIX	0x0
+@@ -5254,6 +5255,7 @@ u32 tg3FwData[(TG3_FW_DATA_LEN / sizeof(u32)) + 1] = {
+ 	0x00000000, 0x00000000, 0x00000000, 0x00000000
+ };
+ #endif
++#endif /* REMOVE_DFSG */
+ 
+ #define RX_CPU_SCRATCH_BASE	0x30000
+ #define RX_CPU_SCRATCH_SIZE	0x04000
+@@ -5433,6 +5435,7 @@ static int tg3_load_5701_a0_firmware_fix(struct tg3 *tp)
+ }
+ 
+ 
++#ifdef REMOVE_DFSG
+ #define TG3_TSO_FW_RELEASE_MAJOR	0x1
+ #define TG3_TSO_FW_RELASE_MINOR		0x6
+ #define TG3_TSO_FW_RELEASE_FIX		0x0
+@@ -5936,4 +5939,5 @@ static const u32 tg3Tso5FwData[(TG3_TSO5_FW_DATA_LEN / 4) + 1] = {
+ 	0x00000000, 0x00000000, 0x00000000,
+ };
++#endif /* REMOVE_DFSG */
+ 
+ /* tp->lock is held. */

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	Sat Sep 15 18:40:02 2007
@@ -4,6 +4,8 @@
 rm drivers/media/video/dabusb.c
 rm drivers/media/video/dabusb.h
 
+unifdef drivers/net/tg3.c -UREMOVE_DFSG
+
 rm drivers/net/appletalk/cops.c
 rm drivers/net/appletalk/cops.h
 rm drivers/net/appletalk/cops_ffdrv.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	Sat Sep 15 18:40:02 2007
@@ -1,7 +1,8 @@
-X debian/dfsg/files-1
 + debian/dfsg/drivers-media-video-dabus.patch
 + debian/dfsg/drivers-net-appletalk-cops.patch
 + debian/dfsg/drivers-net-dgrs.patch
++ debian/dfsg/drivers-net-tg3.patch
 + debian/dfsg/drivers-net-tokenring-3c359-smctr.patch
 + debian/dfsg/drivers-usb-misc-emi62-emi26.patch
 + debian/dfsg/drivers-usb-serial-keyspan.patch
+X debian/dfsg/files-1