diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/net/fs_enet/mii-fec.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/net/fs_enet/mii-fec.c')
| -rw-r--r-- | drivers/net/fs_enet/mii-fec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/fs_enet/mii-fec.c b/drivers/net/fs_enet/mii-fec.c index 96eba4280c5c..5944b65082cb 100644 --- a/drivers/net/fs_enet/mii-fec.c +++ b/drivers/net/fs_enet/mii-fec.c | |||
| @@ -52,7 +52,7 @@ | |||
| 52 | static int fs_enet_fec_mii_read(struct mii_bus *bus , int phy_id, int location) | 52 | static int fs_enet_fec_mii_read(struct mii_bus *bus , int phy_id, int location) |
| 53 | { | 53 | { |
| 54 | struct fec_info* fec = bus->priv; | 54 | struct fec_info* fec = bus->priv; |
| 55 | fec_t __iomem *fecp = fec->fecp; | 55 | struct fec __iomem *fecp = fec->fecp; |
| 56 | int i, ret = -1; | 56 | int i, ret = -1; |
| 57 | 57 | ||
| 58 | BUG_ON((in_be32(&fecp->fec_r_cntrl) & FEC_RCNTRL_MII_MODE) == 0); | 58 | BUG_ON((in_be32(&fecp->fec_r_cntrl) & FEC_RCNTRL_MII_MODE) == 0); |
| @@ -75,7 +75,7 @@ static int fs_enet_fec_mii_read(struct mii_bus *bus , int phy_id, int location) | |||
| 75 | static int fs_enet_fec_mii_write(struct mii_bus *bus, int phy_id, int location, u16 val) | 75 | static int fs_enet_fec_mii_write(struct mii_bus *bus, int phy_id, int location, u16 val) |
| 76 | { | 76 | { |
| 77 | struct fec_info* fec = bus->priv; | 77 | struct fec_info* fec = bus->priv; |
| 78 | fec_t __iomem *fecp = fec->fecp; | 78 | struct fec __iomem *fecp = fec->fecp; |
| 79 | int i; | 79 | int i; |
| 80 | 80 | ||
| 81 | /* this must never happen */ | 81 | /* this must never happen */ |