diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 12:11:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 12:11:31 -0400 |
| commit | 58d4ea65b98f154f3326b038eecda32f90b46ea8 (patch) | |
| tree | 636aed413349dece12c08a4bd3d1fea0254976d8 /drivers/net/sunbmac.h | |
| parent | 26f0cf91813bdc8e61595f8ad6660251e2ee9cf6 (diff) | |
| parent | fbe0f8348fd6c3d016a3f48756eb729b41a67c22 (diff) | |
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6:
mmc_spi: Fix unterminated of_match_table
of/sparc: fix build regression from of_device changes
of/device: Replace struct of_device with struct platform_device
Diffstat (limited to 'drivers/net/sunbmac.h')
| -rw-r--r-- | drivers/net/sunbmac.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sunbmac.h b/drivers/net/sunbmac.h index 8840bc0b840b..8db88945b889 100644 --- a/drivers/net/sunbmac.h +++ b/drivers/net/sunbmac.h | |||
| @@ -329,8 +329,8 @@ struct bigmac { | |||
| 329 | unsigned int timer_ticks; | 329 | unsigned int timer_ticks; |
| 330 | 330 | ||
| 331 | struct net_device_stats enet_stats; | 331 | struct net_device_stats enet_stats; |
| 332 | struct of_device *qec_op; | 332 | struct platform_device *qec_op; |
| 333 | struct of_device *bigmac_op; | 333 | struct platform_device *bigmac_op; |
| 334 | struct net_device *dev; | 334 | struct net_device *dev; |
| 335 | }; | 335 | }; |
| 336 | 336 | ||