summaryrefslogtreecommitdiff
path: root/arch/sh
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-10-31 07:32:56 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-31 07:32:56 -0800
commit4fd5f8267dd37aaebadfabe71d9c808821eea05a (patch)
tree50774592eaba942cf378fca731d307f901b737b7 /arch/sh
parenteb16292ba8a6655a560ab10a7d73a7816f0c0ac0 (diff)
parent8576762ff5d109b841fcf4e7d3883e0cf794f3cf (diff)
downloadlinux-3.10-4fd5f8267dd37aaebadfabe71d9c808821eea05a.tar.gz
linux-3.10-4fd5f8267dd37aaebadfabe71d9c808821eea05a.tar.bz2
linux-3.10-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 'arch/sh')
-rw-r--r--arch/sh/boards/superh/microdev/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/boards/superh/microdev/setup.c b/arch/sh/boards/superh/microdev/setup.c
index c18919941ec..1c1d65fb12d 100644
--- a/arch/sh/boards/superh/microdev/setup.c
+++ b/arch/sh/boards/superh/microdev/setup.c
@@ -13,7 +13,7 @@
#include <linux/config.h>
#include <linux/init.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
#include <linux/ioport.h>
#include <asm/io.h>
#include <asm/mach/irq.h>