diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-15 03:35:24 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-15 03:36:16 -0400 |
| commit | b257c14ceb1194a6181144210056d38f22127189 (patch) | |
| tree | c803925f1d5bf2237e7495d306bf43929df0c952 /drivers/net/3c515.c | |
| parent | 371fd7e7a56a5c136d31aa980011bd2f131c3ef5 (diff) | |
| parent | 2ba3abd8186f24c7fb418927025b4e2120e3a362 (diff) | |
Merge branch 'linus' into sched/core
Merge reason: merge the latest fixes, update to -rc4.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/3c515.c')
| -rw-r--r-- | drivers/net/3c515.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/3c515.c b/drivers/net/3c515.c index 1e898b1c8068..2e17837be546 100644 --- a/drivers/net/3c515.c +++ b/drivers/net/3c515.c | |||
| @@ -65,7 +65,6 @@ static int max_interrupt_work = 20; | |||
| 65 | #include <linux/errno.h> | 65 | #include <linux/errno.h> |
| 66 | #include <linux/in.h> | 66 | #include <linux/in.h> |
| 67 | #include <linux/ioport.h> | 67 | #include <linux/ioport.h> |
| 68 | #include <linux/slab.h> | ||
| 69 | #include <linux/skbuff.h> | 68 | #include <linux/skbuff.h> |
| 70 | #include <linux/etherdevice.h> | 69 | #include <linux/etherdevice.h> |
| 71 | #include <linux/interrupt.h> | 70 | #include <linux/interrupt.h> |