diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-09 09:09:29 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-09 09:09:29 -0400 |
| commit | 054d5c9238f3c577ad51195c3ee7803613f322cc (patch) | |
| tree | ff7d9f5c0e0ddf14230ba28f28ef69a2c0a0debf /drivers/net/niu.h | |
| parent | 11e4afb49b7fa1fc8e1ffd850c1806dd86a08204 (diff) | |
| parent | 2192482ee5ce5d5d4a6cec0c351b2d3a744606eb (diff) | |
Merge branch 'devel-stable' into devel
Diffstat (limited to 'drivers/net/niu.h')
| -rw-r--r-- | drivers/net/niu.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/niu.h b/drivers/net/niu.h index d6715465f35d..a41fa8ebe05f 100644 --- a/drivers/net/niu.h +++ b/drivers/net/niu.h | |||
| @@ -3236,7 +3236,7 @@ struct niu_phy_ops { | |||
| 3236 | int (*link_status)(struct niu *np, int *); | 3236 | int (*link_status)(struct niu *np, int *); |
| 3237 | }; | 3237 | }; |
| 3238 | 3238 | ||
| 3239 | struct of_device; | 3239 | struct platform_device; |
| 3240 | struct niu { | 3240 | struct niu { |
| 3241 | void __iomem *regs; | 3241 | void __iomem *regs; |
| 3242 | struct net_device *dev; | 3242 | struct net_device *dev; |
| @@ -3297,7 +3297,7 @@ struct niu { | |||
| 3297 | struct niu_vpd vpd; | 3297 | struct niu_vpd vpd; |
| 3298 | u32 eeprom_len; | 3298 | u32 eeprom_len; |
| 3299 | 3299 | ||
| 3300 | struct of_device *op; | 3300 | struct platform_device *op; |
| 3301 | void __iomem *vir_regs_1; | 3301 | void __iomem *vir_regs_1; |
| 3302 | void __iomem *vir_regs_2; | 3302 | void __iomem *vir_regs_2; |
| 3303 | }; | 3303 | }; |