diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-02-10 14:45:43 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-02-10 14:45:43 -0500 |
| commit | 81b7bbd1932a04869d4c8635a75222dfc6089f96 (patch) | |
| tree | 285ae868a1e3a41fb0dbfe346c28e380949bcb55 /drivers/net/chelsio/common.h | |
| parent | 98051995ab44b993f992946055edc6115351f725 (diff) | |
| parent | 66efc5a7e3061c3597ac43a8bb1026488d57e66b (diff) | |
Merge branch 'linus'
Conflicts:
drivers/scsi/ipr.c
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/net/chelsio/common.h')
| -rw-r--r-- | drivers/net/chelsio/common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/chelsio/common.h b/drivers/net/chelsio/common.h index 74758d2c7af8..787f2f2820fe 100644 --- a/drivers/net/chelsio/common.h +++ b/drivers/net/chelsio/common.h | |||
| @@ -324,7 +324,7 @@ struct board_info { | |||
| 324 | unsigned char mdio_phybaseaddr; | 324 | unsigned char mdio_phybaseaddr; |
| 325 | struct gmac *gmac; | 325 | struct gmac *gmac; |
| 326 | struct gphy *gphy; | 326 | struct gphy *gphy; |
| 327 | struct mdio_ops *mdio_ops; | 327 | struct mdio_ops *mdio_ops; |
| 328 | const char *desc; | 328 | const char *desc; |
| 329 | }; | 329 | }; |
| 330 | 330 | ||