diff options
| author | Chris Zankel <chris@zankel.net> | 2009-04-03 05:29:05 -0400 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2009-04-03 05:29:05 -0400 |
| commit | 65127d28e312bb6b38ce84a7bb71d762ef63ad4c (patch) | |
| tree | d5fdf52a2d0731f7fab0ce0ed394faac50b04fbc /drivers/net/dm9000.c | |
| parent | b8bb76713ec50df2f11efee386e16f93d51e1076 (diff) | |
| parent | 8fe74cf053de7ad2124a894996f84fa890a81093 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into merge
Diffstat (limited to 'drivers/net/dm9000.c')
| -rw-r--r-- | drivers/net/dm9000.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c index 254ec62b5f58..d8350860c0f8 100644 --- a/drivers/net/dm9000.c +++ b/drivers/net/dm9000.c | |||
| @@ -559,7 +559,7 @@ static void dm9000_show_carrier(board_info_t *db, | |||
| 559 | static void | 559 | static void |
| 560 | dm9000_poll_work(struct work_struct *w) | 560 | dm9000_poll_work(struct work_struct *w) |
| 561 | { | 561 | { |
| 562 | struct delayed_work *dw = container_of(w, struct delayed_work, work); | 562 | struct delayed_work *dw = to_delayed_work(w); |
| 563 | board_info_t *db = container_of(dw, board_info_t, phy_poll); | 563 | board_info_t *db = container_of(dw, board_info_t, phy_poll); |
| 564 | struct net_device *ndev = db->ndev; | 564 | struct net_device *ndev = db->ndev; |
| 565 | 565 | ||