diff options
author | Andy Boyett <agb@openwrt.org> | 2009-05-15 10:36:04 +0000 |
---|---|---|
committer | Andy Boyett <agb@openwrt.org> | 2009-05-15 10:36:04 +0000 |
commit | 8d1f64af73ac68bd1d4f017cef7d3dbeaa5fc6e0 (patch) | |
tree | 9b091ee20cd4b6f105d47c24c442c8c98a429465 /target/linux/generic-2.4/patches/803-mii_ioctl.patch | |
parent | fadda2c9fa8120b257f258037345012b73e26e28 (diff) | |
download | master-187ad058-8d1f64af73ac68bd1d4f017cef7d3dbeaa5fc6e0.tar.gz master-187ad058-8d1f64af73ac68bd1d4f017cef7d3dbeaa5fc6e0.tar.bz2 master-187ad058-8d1f64af73ac68bd1d4f017cef7d3dbeaa5fc6e0.zip |
[kernel] generic-2.4: refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15860 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.4/patches/803-mii_ioctl.patch')
-rw-r--r-- | target/linux/generic-2.4/patches/803-mii_ioctl.patch | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/target/linux/generic-2.4/patches/803-mii_ioctl.patch b/target/linux/generic-2.4/patches/803-mii_ioctl.patch index 9c74a58bac..86b0309d4a 100644 --- a/target/linux/generic-2.4/patches/803-mii_ioctl.patch +++ b/target/linux/generic-2.4/patches/803-mii_ioctl.patch @@ -1,6 +1,5 @@ -diff -urN linux-2.4.35.4/include/linux/mii.h linux-2.4.35.4.new/include/linux/mii.h ---- linux-2.4.35.4/include/linux/mii.h 2007-11-17 18:23:15.000000000 +0100 -+++ linux-2.4.35.4.new/include/linux/mii.h 2009-03-15 17:32:45.000000000 +0100 +--- a/include/linux/mii.h ++++ b/include/linux/mii.h @@ -9,7 +9,6 @@ #define __LINUX_MII_H__ @@ -29,7 +28,7 @@ diff -urN linux-2.4.35.4/include/linux/mii.h linux-2.4.35.4.new/include/linux/mi struct mii_if_info { int phy_id; -@@ -119,9 +131,6 @@ +@@ -119,9 +131,6 @@ struct mii_if_info { void (*mdio_write) (struct net_device *dev, int phy_id, int location, int val); }; @@ -39,7 +38,7 @@ diff -urN linux-2.4.35.4/include/linux/mii.h linux-2.4.35.4.new/include/linux/mi extern int mii_link_ok (struct mii_if_info *mii); extern int mii_nway_restart (struct mii_if_info *mii); extern int mii_ethtool_gset(struct mii_if_info *mii, struct ethtool_cmd *ecmd); -@@ -136,15 +145,6 @@ +@@ -136,15 +145,6 @@ extern int generic_mii_ioctl(struct mii_ @@ -55,7 +54,7 @@ diff -urN linux-2.4.35.4/include/linux/mii.h linux-2.4.35.4.new/include/linux/mi static inline struct mii_ioctl_data *if_mii(struct ifreq *rq) { return (struct mii_ioctl_data *) &rq->ifr_ifru; -@@ -202,5 +202,5 @@ +@@ -202,5 +202,5 @@ static inline unsigned int mii_duplex (u return 0; } |