debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

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.

svn path=/dists/trunk/linux-2.6/; revision=9585
This commit is contained in:
Bastian Blank 2007-09-28 11:09:18 +00:00
parent 017b2001f1
commit bc96cb8a5f
3 changed files with 32 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
debian/patches/debian/dfsg/drivers-net-tg3-mark.patch vendored Normal file
View File

@ -0,0 +1,30 @@
--- 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
@@ -5255,4 +5256,5 @@ u32 tg3FwData[(TG3_FW_DATA_LEN / sizeof(u32)) + 1] = {
};
#endif
+#endif /* REMOVE_DFSG */
#define RX_CPU_SCRATCH_BASE 0x30000
@@ -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. */

34
debian/patches/debian/dfsg/drivers-net-tg3-remove.patch vendored
View File

@ -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 @@ index 5b9e17b..d6ba3a9 100644
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 @@ index 9034a05..a3ad51e 100644
*/
@@ -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. */

3
debian/patches/series/orig-0 vendored
View File

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