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/ns83820.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/ns83820.c')
| -rw-r--r-- | drivers/net/ns83820.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c index c594e1946476..57fd483dbb1f 100644 --- a/drivers/net/ns83820.c +++ b/drivers/net/ns83820.c | |||
| @@ -111,6 +111,7 @@ | |||
| 111 | #include <linux/compiler.h> | 111 | #include <linux/compiler.h> |
| 112 | #include <linux/prefetch.h> | 112 | #include <linux/prefetch.h> |
| 113 | #include <linux/ethtool.h> | 113 | #include <linux/ethtool.h> |
| 114 | #include <linux/sched.h> | ||
| 114 | #include <linux/timer.h> | 115 | #include <linux/timer.h> |
| 115 | #include <linux/if_vlan.h> | 116 | #include <linux/if_vlan.h> |
| 116 | #include <linux/rtnetlink.h> | 117 | #include <linux/rtnetlink.h> |