diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-03 06:52:33 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-03 06:52:33 -0400 |
| commit | 56f68556d7bbb51dd158c74deb09c783345bfbbd (patch) | |
| tree | 536e6e3c7063b1eee927194dda257602bd3dc66f /drivers/net/gianfar.h | |
| parent | fd9470ce3ac6fb54d6026e4b1cdab0936e34805e (diff) | |
| parent | 7c8ad9828e793573877fd60868bb5d2f1e3b64da (diff) | |
Merge unstable branch 'omap-rmk'
Merge branch 'omap-rmk' into omap-all
Diffstat (limited to 'drivers/net/gianfar.h')
| -rw-r--r-- | drivers/net/gianfar.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/gianfar.h b/drivers/net/gianfar.h index d59df98bd636..f46e9b63af13 100644 --- a/drivers/net/gianfar.h +++ b/drivers/net/gianfar.h | |||
| @@ -756,6 +756,7 @@ struct gfar_private { | |||
| 756 | 756 | ||
| 757 | uint32_t msg_enable; | 757 | uint32_t msg_enable; |
| 758 | 758 | ||
| 759 | struct work_struct reset_task; | ||
| 759 | /* Network Statistics */ | 760 | /* Network Statistics */ |
| 760 | struct gfar_extra_stats extra_stats; | 761 | struct gfar_extra_stats extra_stats; |
| 761 | }; | 762 | }; |