aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-12-27 11:22:54 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-12-27 11:22:54 +0000
commitf23c949b4f86f63e8b2c3fc76b1f36725c511ac4 (patch)
tree7f8bbe7c00c3e6536150996e82a801cc47299e39
parentb7a04fc839c16787dd6c060ac1a0382f75e06c32 (diff)
downloadupstream-f23c949b4f86f63e8b2c3fc76b1f36725c511ac4.tar.gz
upstream-f23c949b4f86f63e8b2c3fc76b1f36725c511ac4.tar.bz2
upstream-f23c949b4f86f63e8b2c3fc76b1f36725c511ac4.zip
[kernel] 2.6.28: refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13748 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/610-phy_detect.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/630-phy_packets.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/951-revert_gcc4_4_fixes.patch2
3 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.28/610-phy_detect.patch b/target/linux/generic-2.6/patches-2.6.28/610-phy_detect.patch
index 9790ab695b..84e6e1f0dd 100644
--- a/target/linux/generic-2.6/patches-2.6.28/610-phy_detect.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/610-phy_detect.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
-@@ -273,6 +273,9 @@ static int mdio_bus_match(struct device
+@@ -274,6 +274,9 @@ static int mdio_bus_match(struct device
struct phy_device *phydev = to_phy_device(dev);
struct phy_driver *phydrv = to_phy_driver(drv);
diff --git a/target/linux/generic-2.6/patches-2.6.28/630-phy_packets.patch b/target/linux/generic-2.6/patches-2.6.28/630-phy_packets.patch
index cc93307d84..c85ec74130 100644
--- a/target/linux/generic-2.6/patches-2.6.28/630-phy_packets.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/630-phy_packets.patch
@@ -53,7 +53,7 @@
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
-@@ -627,6 +627,7 @@ struct net_device
+@@ -628,6 +628,7 @@ struct net_device
void *ax25_ptr; /* AX.25 specific data */
struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data,
assign before registering */
diff --git a/target/linux/generic-2.6/patches-2.6.28/951-revert_gcc4_4_fixes.patch b/target/linux/generic-2.6/patches-2.6.28/951-revert_gcc4_4_fixes.patch
index ade26dcef4..a49b9eb789 100644
--- a/target/linux/generic-2.6/patches-2.6.28/951-revert_gcc4_4_fixes.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/951-revert_gcc4_4_fixes.patch
@@ -236,7 +236,7 @@
-#endif
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
-@@ -53,7 +53,7 @@ $(addprefix $(obj)/,$(zlib) cuboot-c2k.o
+@@ -54,7 +54,7 @@ $(addprefix $(obj)/,$(zlib) cuboot-c2k.o
$(addprefix $(obj)/,$(zliblinuxheader)) $(addprefix $(obj)/,$(zlibheader))
src-libfdt := fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c