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/gianfar.h | |
| 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/gianfar.h')
| -rw-r--r-- | drivers/net/gianfar.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/gianfar.h b/drivers/net/gianfar.h index dd499d7cde26..0642d52aef5c 100644 --- a/drivers/net/gianfar.h +++ b/drivers/net/gianfar.h | |||
| @@ -45,7 +45,6 @@ | |||
| 45 | #include <linux/crc32.h> | 45 | #include <linux/crc32.h> |
| 46 | #include <linux/workqueue.h> | 46 | #include <linux/workqueue.h> |
| 47 | #include <linux/ethtool.h> | 47 | #include <linux/ethtool.h> |
| 48 | #include <linux/fsl_devices.h> | ||
| 49 | 48 | ||
| 50 | /* The maximum number of packets to be handled in one call of gfar_poll */ | 49 | /* The maximum number of packets to be handled in one call of gfar_poll */ |
| 51 | #define GFAR_DEV_WEIGHT 64 | 50 | #define GFAR_DEV_WEIGHT 64 |