diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-11-22 13:06:44 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-11-22 13:06:44 -0500 |
| commit | 0bd2af46839ad6262d25714a6ec0365db9d6b98f (patch) | |
| tree | dcced72d230d69fd0c5816ac6dd03ab84799a93e /drivers/net/ucc_geth_phy.h | |
| parent | e138a5d2356729b8752e88520cc1525fae9794ac (diff) | |
| parent | f26b90440cd74c78fe10c9bd5160809704a9627c (diff) | |
Merge ../scsi-rc-fixes-2.6
Diffstat (limited to 'drivers/net/ucc_geth_phy.h')
| -rw-r--r-- | drivers/net/ucc_geth_phy.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ucc_geth_phy.h b/drivers/net/ucc_geth_phy.h index 2f98b8f1bb0a..f5740783670f 100644 --- a/drivers/net/ucc_geth_phy.h +++ b/drivers/net/ucc_geth_phy.h | |||
| @@ -126,7 +126,7 @@ struct ugeth_mii_info { | |||
| 126 | /* And management functions */ | 126 | /* And management functions */ |
| 127 | struct phy_info *phyinfo; | 127 | struct phy_info *phyinfo; |
| 128 | 128 | ||
| 129 | ucc_mii_mng_t *mii_regs; | 129 | struct ucc_mii_mng *mii_regs; |
| 130 | 130 | ||
| 131 | /* forced speed & duplex (no autoneg) | 131 | /* forced speed & duplex (no autoneg) |
| 132 | * partner speed & duplex & pause (autoneg) | 132 | * partner speed & duplex & pause (autoneg) |