summaryrefslogtreecommitdiffstats
path: root/drivers/net/irda/smsc-ircc2.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-10-31 16:32:56 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-31 16:32:56 +0100
commit4fd5f8267dd37aaebadfabe71d9c808821eea05a (patch)
tree50774592eaba942cf378fca731d307f901b737b7 /drivers/net/irda/smsc-ircc2.c
parentInput: adbhid - fix OOPS introduced by dynalloc conversion (diff)
parent[DRIVER MODEL] Add missing driver_unregister to IMX serial driver (diff)
downloadlinux-4fd5f8267dd37aaebadfabe71d9c808821eea05a.tar.xz
linux-4fd5f8267dd37aaebadfabe71d9c808821eea05a.zip
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.c1
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 @@
#include <linux/rtnetlink.h>
#include <linux/serial_reg.h>
#include <linux/dma-mapping.h>
+#include <linux/platform_device.h>
#include <asm/io.h>
#include <asm/dma.h>