diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
| commit | 91e229bbad6524aabaac8717b2f559283670c37a (patch) | |
| tree | 84a55e4ac2dcf23add97bd9fde3e9cb232c12b30 /drivers/net/gianfar_mii.c | |
| parent | 6e5e93424dc66542c548dfaa3bfebe30d46d50dd (diff) | |
| parent | bfa274e2436fc7ef72ef51c878083647f1cfd429 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'drivers/net/gianfar_mii.c')
| -rw-r--r-- | drivers/net/gianfar_mii.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |