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/sb1000.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/sb1000.c')
| -rw-r--r-- | drivers/net/sb1000.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sb1000.c b/drivers/net/sb1000.c index 9f83a1197375..abc8eefdd4b6 100644 --- a/drivers/net/sb1000.c +++ b/drivers/net/sb1000.c | |||
| @@ -42,7 +42,6 @@ static char version[] = "sb1000.c:v1.1.2 6/01/98 (fventuri@mediaone.net)\n"; | |||
| 42 | #include <linux/errno.h> | 42 | #include <linux/errno.h> |
| 43 | #include <linux/if_cablemodem.h> /* for SIOGCM/SIOSCM stuff */ | 43 | #include <linux/if_cablemodem.h> /* for SIOGCM/SIOSCM stuff */ |
| 44 | #include <linux/in.h> | 44 | #include <linux/in.h> |
| 45 | #include <linux/slab.h> | ||
| 46 | #include <linux/ioport.h> | 45 | #include <linux/ioport.h> |
| 47 | #include <linux/netdevice.h> | 46 | #include <linux/netdevice.h> |
| 48 | #include <linux/if_arp.h> | 47 | #include <linux/if_arp.h> |
| @@ -52,6 +51,7 @@ static char version[] = "sb1000.c:v1.1.2 6/01/98 (fventuri@mediaone.net)\n"; | |||
| 52 | #include <linux/pnp.h> | 51 | #include <linux/pnp.h> |
| 53 | #include <linux/init.h> | 52 | #include <linux/init.h> |
| 54 | #include <linux/bitops.h> | 53 | #include <linux/bitops.h> |
| 54 | #include <linux/gfp.h> | ||
| 55 | 55 | ||
| 56 | #include <asm/io.h> | 56 | #include <asm/io.h> |
| 57 | #include <asm/processor.h> | 57 | #include <asm/processor.h> |