diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
| commit | 330f28f691e9b349e34adcaf82b273cf061bb491 (patch) | |
| tree | fca3bfe41eff25ef19f576cef1979c68f6521af5 /drivers/net/forcedeth.c | |
| parent | fe3e78e073d25308756f38019956061153267769 (diff) | |
| parent | 6fc786d5034ed7ce2d43c459211137de6d99dd28 (diff) | |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'drivers/net/forcedeth.c')
| -rw-r--r-- | drivers/net/forcedeth.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index 0a1c2bb27d4d..e1da4666f204 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c | |||
| @@ -49,6 +49,7 @@ | |||
| 49 | #include <linux/netdevice.h> | 49 | #include <linux/netdevice.h> |
| 50 | #include <linux/etherdevice.h> | 50 | #include <linux/etherdevice.h> |
| 51 | #include <linux/delay.h> | 51 | #include <linux/delay.h> |
| 52 | #include <linux/sched.h> | ||
| 52 | #include <linux/spinlock.h> | 53 | #include <linux/spinlock.h> |
| 53 | #include <linux/ethtool.h> | 54 | #include <linux/ethtool.h> |
| 54 | #include <linux/timer.h> | 55 | #include <linux/timer.h> |