diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-31 10:32:56 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-31 10:32:56 -0500 |
| commit | 4fd5f8267dd37aaebadfabe71d9c808821eea05a (patch) | |
| tree | 50774592eaba942cf378fca731d307f901b737b7 /drivers/net/irda/smsc-ircc2.c | |
| parent | eb16292ba8a6655a560ab10a7d73a7816f0c0ac0 (diff) | |
| parent | 8576762ff5d109b841fcf4e7d3883e0cf794f3cf (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel
Manual #include fixups for clashes - there may be some unnecessary
Diffstat (limited to 'drivers/net/irda/smsc-ircc2.c')
| -rw-r--r-- | drivers/net/irda/smsc-ircc2.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c index 140b7cdb1f7e..a1d207f2fa68 100644 --- a/drivers/net/irda/smsc-ircc2.c +++ b/drivers/net/irda/smsc-ircc2.c | |||
| @@ -53,6 +53,7 @@ | |||
| 53 | #include <linux/rtnetlink.h> | 53 | #include <linux/rtnetlink.h> |
| 54 | #include <linux/serial_reg.h> | 54 | #include <linux/serial_reg.h> |
| 55 | #include <linux/dma-mapping.h> | 55 | #include <linux/dma-mapping.h> |
| 56 | #include <linux/platform_device.h> | ||
| 56 | 57 | ||
| 57 | #include <asm/io.h> | 58 | #include <asm/io.h> |
| 58 | #include <asm/dma.h> | 59 | #include <asm/dma.h> |