diff options
author | Al Viro <viro@ZenIV.linux.org.uk> | 2008-02-12 22:58:36 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2008-02-15 10:51:53 -0500 |
commit | fdb26629f31b898c2c4a4127c7d5c2401fb5ac60 (patch) | |
tree | b6683cbfdb8bffdb0abdbe1df4d7af7c421af7d4 | |
parent | 9f30c768c00fd0f0a2ab37ef29d8c8c5a7abdf2e (diff) |
gianfar iomem misannotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r-- | drivers/net/gianfar.c | 4 | ||||
-rw-r--r-- | drivers/net/gianfar_mii.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index 0431e9ed0fac..4244fc282f21 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c | |||
@@ -130,8 +130,8 @@ static void free_skb_resources(struct gfar_private *priv); | |||
130 | static void gfar_set_multi(struct net_device *dev); | 130 | static void gfar_set_multi(struct net_device *dev); |
131 | static void gfar_set_hash_for_addr(struct net_device *dev, u8 *addr); | 131 | static void gfar_set_hash_for_addr(struct net_device *dev, u8 *addr); |
132 | static void gfar_configure_serdes(struct net_device *dev); | 132 | static void gfar_configure_serdes(struct net_device *dev); |
133 | extern int gfar_local_mdio_write(struct gfar_mii *regs, int mii_id, int regnum, u16 value); | 133 | extern int gfar_local_mdio_write(struct gfar_mii __iomem *regs, int mii_id, int regnum, u16 value); |
134 | extern int gfar_local_mdio_read(struct gfar_mii *regs, int mii_id, int regnum); | 134 | extern int gfar_local_mdio_read(struct gfar_mii __iomem *regs, int mii_id, int regnum); |
135 | #ifdef CONFIG_GFAR_NAPI | 135 | #ifdef CONFIG_GFAR_NAPI |
136 | static int gfar_poll(struct napi_struct *napi, int budget); | 136 | static int gfar_poll(struct napi_struct *napi, int budget); |
137 | #endif | 137 | #endif |
diff --git a/drivers/net/gianfar_mii.c b/drivers/net/gianfar_mii.c index 6a647d95e6ea..24327629bf03 100644 --- a/drivers/net/gianfar_mii.c +++ b/drivers/net/gianfar_mii.c | |||
@@ -51,7 +51,7 @@ | |||
51 | * the local mdio pins, which may not be the same as system mdio bus, used for | 51 | * the local mdio pins, which may not be the same as system mdio bus, used for |
52 | * controlling the external PHYs, for example. | 52 | * controlling the external PHYs, for example. |
53 | */ | 53 | */ |
54 | int gfar_local_mdio_write(struct gfar_mii *regs, int mii_id, | 54 | int gfar_local_mdio_write(struct gfar_mii __iomem *regs, int mii_id, |
55 | int regnum, u16 value) | 55 | int regnum, u16 value) |
56 | { | 56 | { |
57 | /* Set the PHY address and the register address we want to write */ | 57 | /* Set the PHY address and the register address we want to write */ |
@@ -77,7 +77,7 @@ int gfar_local_mdio_write(struct gfar_mii *regs, int mii_id, | |||
77 | * and are always tied to the local mdio pins, which may not be the | 77 | * and are always tied to the local mdio pins, which may not be the |
78 | * same as system mdio bus, used for controlling the external PHYs, for eg. | 78 | * same as system mdio bus, used for controlling the external PHYs, for eg. |
79 | */ | 79 | */ |
80 | int gfar_local_mdio_read(struct gfar_mii *regs, int mii_id, int regnum) | 80 | int gfar_local_mdio_read(struct gfar_mii __iomem *regs, int mii_id, int regnum) |
81 | 81 | ||
82 | { | 82 | { |
83 | u16 value; | 83 | u16 value; |