summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2001-05-18 22:13:23 +0000
committerRalf Baechle <ralf@linux-mips.org>2001-05-18 22:13:23 +0000
commit04a4a0b7c6ab2c36e0cf645a42dca0cce0fa281e (patch)
tree6c2d781676e4066eea8050160431ef67ca3f11de /drivers/net
parenta99f258ce7f325455fd36fc38cfa28de704ade17 (diff)
Move Alchemy board to the new interrupt handling plus various other
cleanup. Patch from Pete Popov.
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/au1000_eth.c4
-rw-r--r--drivers/net/au1000_eth.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c
index 297c7c6ca..3ebf32ab1 100644
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
@@ -194,7 +194,7 @@ int bcm_5201_reset(struct net_device *dev, int phy_addr)
}
int
-bcm_5201_status(struct net_device *dev, int phy_addr, int *link, int *speed)
+bcm_5201_status(struct net_device *dev, int phy_addr, u16 *link, u16 *speed)
{
u16 mii_data;
struct au1000_private *aup;
@@ -246,7 +246,7 @@ int am79c901_reset(struct net_device *dev, int phy_addr)
}
int
-am79c901_status(struct net_device *dev, int phy_addr, int *link, int *speed)
+am79c901_status(struct net_device *dev, int phy_addr, u16 *link, u16 *speed)
{
return 0;
}
diff --git a/drivers/net/au1000_eth.h b/drivers/net/au1000_eth.h
index fcd90c397..e36821e7a 100644
--- a/drivers/net/au1000_eth.h
+++ b/drivers/net/au1000_eth.h
@@ -140,7 +140,7 @@ typedef struct mii_phy {
struct phy_ops {
int (*phy_init) (struct net_device *, int);
int (*phy_reset) (struct net_device *, int);
- int (*phy_status) (struct net_device *, int, int *, int *);
+ int (*phy_status) (struct net_device *, int, u16 *, u16 *);
};
/*