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

[Bastian Blank]

Author: waldi
Date: Fri Sep 28 11:09:18 2007
New Revision: 9585

Log:
Remove files before apply the patches.

* debian/patches/debian/dfsg/drivers-net-tg3-mark.patch: Add.
* debian/patches/debian/dfsg/drivers-net-tg3-remove.patch: Update.
* debian/patches/series/orig-0: Update.


Added:
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-tg3-mark.patch
      - copied, changed from r9582, /dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-tg3-remove.patch
Modified:
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-tg3-remove.patch
   dists/trunk/linux-2.6/debian/patches/series/orig-0

Copied: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-tg3-mark.patch (from r9582, /dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-tg3-remove.patch)
==============================================================================
--- /dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-tg3-remove.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-tg3-mark.patch	Fri Sep 28 11:09:18 2007
@@ -1,34 +1,5 @@
-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
-@@ -5,14 +5,6 @@
-  * Copyright (C) 2001, 2002, 2003 Jeff Garzik (jgarzik at pobox.com)
-  * Copyright (C) 2004 Sun Microsystems Inc.
-  * Copyright (C) 2005-2007 Broadcom Corporation.
-- *
-- * Firmware is:
-- *	Derived from proprietary unpublished source code,
-- *	Copyright (C) 2000-2003 Broadcom Corporation.
-- *
-- *	Permission is hereby granted for the distribution of this firmware
-- *	data in hexadecimal or equivalent format, provided this copyright
-- *	notice is accompanying it.
-  */
- 
- 
 @@ -5131,6 +5131,7 @@ static int tg3_halt(struct tg3 *tp, int kind, int silent)
  	return 0;
  }
@@ -37,14 +8,12 @@
  #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
+@@ -5255,4 +5256,5 @@ u32 tg3FwData[(TG3_FW_DATA_LEN / sizeof(u32)) + 1] = {
  };
  #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)
  }
  

Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-tg3-remove.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-tg3-remove.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-tg3-remove.patch	Fri Sep 28 11:09:18 2007
@@ -1,5 +1,3 @@
-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
@@ -10,8 +8,6 @@
  	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
 @@ -5,14 +5,6 @@
@@ -29,33 +25,3 @@
   */
  
  
-@@ -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/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:09:18 2007
@@ -1,3 +1,5 @@
++ debian/dfsg/drivers-net-tg3-mark.patch
+X debian/dfsg/files-1
 + debian/dfsg/drivers-atm.patch
 + debian/dfsg/drivers-char-computone.patch
 + debian/dfsg/drivers-media-dvb-ttusb-budget.patch
@@ -14,4 +16,3 @@
 + debian/dfsg/drivers-usb-misc-emi62-emi26.patch
 + debian/dfsg/drivers-usb-serial-keyspan-remove.patch
 + debian/dfsg/sound-pci.patch
-X debian/dfsg/files-1