diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-10-15 02:07:26 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-10-15 02:07:30 -0400 |
| commit | a0738a688d1105cbf8d71868a1e020c6cdf42d4c (patch) | |
| tree | 2cad553a9def773ce79b8fc793f89c0634187109 /drivers/net/forcedeth.c | |
| parent | 89ccf465abe6b20d804a63ae20307970c441369d (diff) | |
| parent | a3ccf63ee643ef243cbf8918da8b3f9238f10029 (diff) | |
Merge branch 'linus' into x86/urgent
Merge reason: pull in latest, to be able to revert a patch there.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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> |