diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-08 07:36:36 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-08 07:37:18 -0400 |
| commit | ca7e0c612005937a4a5a75d3fed90459993de65c (patch) | |
| tree | b574fc0f0189b52ffc87ba20c418228db556faa1 /drivers/net/tulip/winbond-840.c | |
| parent | 8141d0050d76e5695011b5ab577ec66fb51a998c (diff) | |
| parent | f5284e7635787224dda1a2bf82a4c56b1c75671f (diff) | |
Merge branch 'linus' into perf/core
Semantic conflict: arch/x86/kernel/cpu/perf_event_intel_ds.c
Merge reason: pick up latest fixes, fix the conflict
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/tulip/winbond-840.c')
| -rw-r--r-- | drivers/net/tulip/winbond-840.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c index 304f43866c44..98dbf6cc1d68 100644 --- a/drivers/net/tulip/winbond-840.c +++ b/drivers/net/tulip/winbond-840.c | |||
| @@ -114,7 +114,6 @@ static int full_duplex[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1}; | |||
| 114 | #include <linux/timer.h> | 114 | #include <linux/timer.h> |
| 115 | #include <linux/errno.h> | 115 | #include <linux/errno.h> |
| 116 | #include <linux/ioport.h> | 116 | #include <linux/ioport.h> |
| 117 | #include <linux/slab.h> | ||
| 118 | #include <linux/interrupt.h> | 117 | #include <linux/interrupt.h> |
| 119 | #include <linux/pci.h> | 118 | #include <linux/pci.h> |
| 120 | #include <linux/dma-mapping.h> | 119 | #include <linux/dma-mapping.h> |