summaryrefslogtreecommitdiff
path: root/debian/patches/debian/dfsg
diff options
context:
space:
mode:
authorBen Hutchings <benh@debian.org>2011-02-16 13:38:58 +0000
committerBen Hutchings <benh@debian.org>2011-02-16 13:38:58 +0000
commit3f3fa452a51aa5699c409fce36103df493ad8754 (patch)
treed3add71799ab7fc9df7a59dc720d848366a674d9 /debian/patches/debian/dfsg
parent495b6924868591087411c31e267ffc35a35649a5 (diff)
downloaddebian-kernel-packaging-3f3fa452a51aa5699c409fce36103df493ad8754.tar.gz
Update to 2.6.38-rc5
Adjust/remove patches as appropriate. svn path=/dists/trunk/linux-2.6/; revision=16898
Diffstat (limited to 'debian/patches/debian/dfsg')
-rw-r--r--debian/patches/debian/dfsg/files-15
-rw-r--r--debian/patches/debian/dfsg/firmware-cleanup.patch10
-rw-r--r--debian/patches/debian/dfsg/r8169-rtl8168d-1-2-disable.patch68
3 files changed, 6 insertions, 77 deletions
diff --git a/debian/patches/debian/dfsg/files-1 b/debian/patches/debian/dfsg/files-1
index f5791f402..bb2e4d208 100644
--- a/debian/patches/debian/dfsg/files-1
+++ b/debian/patches/debian/dfsg/files-1
@@ -43,10 +43,7 @@ rm drivers/net/appletalk/cops.h
rm drivers/net/appletalk/cops_ffdrv.h
rm drivers/net/appletalk/cops_ltdrv.h
-unifdef drivers/net/r8169.c -UREMOVE_DFSG
-
-# For next version
-#rm drivers/staging/ft1000/ft1000-pcmcia/boot.h
+rm drivers/staging/ft1000/ft1000-pcmcia/boot.h
rm drivers/staging/keucr/init.h
diff --git a/debian/patches/debian/dfsg/firmware-cleanup.patch b/debian/patches/debian/dfsg/firmware-cleanup.patch
index 75c4231a0..7e4e8c67f 100644
--- a/debian/patches/debian/dfsg/firmware-cleanup.patch
+++ b/debian/patches/debian/dfsg/firmware-cleanup.patch
@@ -18,13 +18,13 @@ index 1c00d05..3bf888d 100644
- adaptec/starfire_tx.bin
fw-shipped-$(CONFIG_ATARI_DSP56K) += dsp56k/bootstrap.bin
-fw-shipped-$(CONFIG_ATM_AMBASSADOR) += atmsar11.fw
--fw-shipped-$(CONFIG_BNX2X) += bnx2x/bnx2x-e1-6.0.34.0.fw \
-- bnx2x/bnx2x-e1h-6.0.34.0.fw \
-- bnx2x/bnx2x-e2-6.0.34.0.fw
--fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-6.0.17.fw \
+-fw-shipped-$(CONFIG_BNX2X) += bnx2x/bnx2x-e1-6.2.5.0.fw \
+- bnx2x/bnx2x-e1h-6.2.5.0.fw \
+- bnx2x/bnx2x-e2-6.2.5.0.fw
+-fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-6.2.1.fw \
- bnx2/bnx2-rv2p-09-6.0.17.fw \
- bnx2/bnx2-rv2p-09ax-6.0.17.fw \
-- bnx2/bnx2-mips-06-6.0.15.fw \
+- bnx2/bnx2-mips-06-6.2.1.fw \
- bnx2/bnx2-rv2p-06-6.0.15.fw
-fw-shipped-$(CONFIG_CASSINI) += sun/cassini.bin
-fw-shipped-$(CONFIG_COMPUTONE) += intelliport2.bin
diff --git a/debian/patches/debian/dfsg/r8169-rtl8168d-1-2-disable.patch b/debian/patches/debian/dfsg/r8169-rtl8168d-1-2-disable.patch
deleted file mode 100644
index db3856328..000000000
--- a/debian/patches/debian/dfsg/r8169-rtl8168d-1-2-disable.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 8ee9e3b6b1f41934a67567aaefae986ff517587e Mon Sep 17 00:00:00 2001
-From: Ben Hutchings <ben@decadent.org.uk>
-Date: Tue, 3 Nov 2009 23:58:25 +0000
-Subject: [PATCH 21/24] r8169: mark firmware for removal and mark code using it as broken
-
----
- drivers/net/r8169.c | 8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
-index fa49356..3495ff6 100644
---- a/drivers/net/r8169.c
-+++ b/drivers/net/r8169.c
-@@ -1719,6 +1719,7 @@ static void rtl8168d_1_hw_phy_config(void __iomem *ioaddr)
- { 0x05, 0x8332 },
- { 0x06, 0x5561 }
- };
-+#ifdef REMOVE_DFSG
- static const struct phy_reg phy_reg_init_2[] = {
- { 0x1f, 0x0005 },
- { 0x05, 0xffc2 },
-@@ -2074,6 +2075,7 @@ static void rtl8168d_1_hw_phy_config(void __iomem *ioaddr)
- { 0x0d, 0xf880 },
- { 0x1f, 0x0000 }
- };
-+#endif
-
- rtl_phy_write(ioaddr, phy_reg_init_0, ARRAY_SIZE(phy_reg_init_0));
-
-@@ -2131,7 +2133,9 @@ static void rtl8168d_1_hw_phy_config(void __iomem *ioaddr)
- mdio_plus_minus(ioaddr, 0x02, 0x0100, 0x0600);
- mdio_plus_minus(ioaddr, 0x03, 0x0000, 0xe000);
-
-+#ifdef CONFIG_BROKEN
- rtl_phy_write(ioaddr, phy_reg_init_2, ARRAY_SIZE(phy_reg_init_2));
-+#endif
- }
-
- static void rtl8168d_2_hw_phy_config(void __iomem *ioaddr)
-@@ -2161,6 +2165,7 @@ static void rtl8168d_2_hw_phy_config(void __iomem *ioaddr)
- { 0x05, 0x8332 },
- { 0x06, 0x5561 }
- };
-+#ifdef REMOVE_DFSG
- static const struct phy_reg phy_reg_init_1[] = {
- { 0x1f, 0x0005 },
- { 0x05, 0xffc2 },
-@@ -2473,6 +2478,7 @@ static void rtl8168d_2_hw_phy_config(void __iomem *ioaddr)
- { 0x0d, 0xf880 },
- { 0x1f, 0x0000 }
- };
-+#endif
-
- rtl_phy_write(ioaddr, phy_reg_init_0, ARRAY_SIZE(phy_reg_init_0));
-
-@@ -2526,7 +2532,9 @@ static void rtl8168d_2_hw_phy_config(void __iomem *ioaddr)
- mdio_write(ioaddr, 0x1f, 0x0002);
- mdio_patch(ioaddr, 0x0f, 0x0017);
-
-+#ifdef CONFIG_BROKEN
- rtl_phy_write(ioaddr, phy_reg_init_1, ARRAY_SIZE(phy_reg_init_1));
-+#endif
- }
-
- static void rtl8168d_3_hw_phy_config(void __iomem *ioaddr)
---
-1.6.5.2
-