2.6.28: refresh patches
SVN-Revision: 13748
This commit is contained in:
parent
98677bd970
commit
86a870f06d
3 changed files with 3 additions and 3 deletions
|
@ -1,6 +1,6 @@
|
||||||
--- a/drivers/net/phy/mdio_bus.c
|
--- a/drivers/net/phy/mdio_bus.c
|
||||||
+++ b/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_device *phydev = to_phy_device(dev);
|
||||||
struct phy_driver *phydrv = to_phy_driver(drv);
|
struct phy_driver *phydrv = to_phy_driver(drv);
|
||||||
|
|
||||||
|
|
|
@ -53,7 +53,7 @@
|
||||||
|
|
||||||
--- a/include/linux/netdevice.h
|
--- a/include/linux/netdevice.h
|
||||||
+++ b/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 */
|
void *ax25_ptr; /* AX.25 specific data */
|
||||||
struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data,
|
struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data,
|
||||||
assign before registering */
|
assign before registering */
|
||||||
|
|
|
@ -236,7 +236,7 @@
|
||||||
-#endif
|
-#endif
|
||||||
--- a/arch/powerpc/boot/Makefile
|
--- a/arch/powerpc/boot/Makefile
|
||||||
+++ b/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))
|
$(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
|
src-libfdt := fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c
|
||||||
|
|
Loading…
Reference in a new issue