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/irda/smsc-ircc2.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/irda/smsc-ircc2.c')
| -rw-r--r-- | drivers/net/irda/smsc-ircc2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c index 8f7d0d146f24..6af84d88cd03 100644 --- a/drivers/net/irda/smsc-ircc2.c +++ b/drivers/net/irda/smsc-ircc2.c | |||
| @@ -48,13 +48,13 @@ | |||
| 48 | #include <linux/netdevice.h> | 48 | #include <linux/netdevice.h> |
| 49 | #include <linux/ioport.h> | 49 | #include <linux/ioport.h> |
| 50 | #include <linux/delay.h> | 50 | #include <linux/delay.h> |
| 51 | #include <linux/slab.h> | ||
| 52 | #include <linux/init.h> | 51 | #include <linux/init.h> |
| 53 | #include <linux/rtnetlink.h> | 52 | #include <linux/rtnetlink.h> |
| 54 | #include <linux/serial_reg.h> | 53 | #include <linux/serial_reg.h> |
| 55 | #include <linux/dma-mapping.h> | 54 | #include <linux/dma-mapping.h> |
| 56 | #include <linux/pnp.h> | 55 | #include <linux/pnp.h> |
| 57 | #include <linux/platform_device.h> | 56 | #include <linux/platform_device.h> |
| 57 | #include <linux/gfp.h> | ||
| 58 | 58 | ||
| 59 | #include <asm/io.h> | 59 | #include <asm/io.h> |
| 60 | #include <asm/dma.h> | 60 | #include <asm/dma.h> |