generic-2.4: refresh patches
SVN-Revision: 15860
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user