diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
| commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
| tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /drivers/net/sunbmac.h | |
| parent | 239cfbde1f5843c4a24199f117d5f67f637d72d5 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
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 b563d3c2993e..8840bc0b840b 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 sbus_dev *qec_sdev; | 332 | struct of_device *qec_op; |
| 333 | struct sbus_dev *bigmac_sdev; | 333 | struct of_device *bigmac_op; |
| 334 | struct net_device *dev; | 334 | struct net_device *dev; |
| 335 | }; | 335 | }; |
| 336 | 336 | ||