summaryrefslogtreecommitdiffstats
path: root/arch/ppc/syslib/mv64x60.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 /arch/ppc/syslib/mv64x60.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 'arch/ppc/syslib/mv64x60.c')
-rw-r--r--arch/ppc/syslib/mv64x60.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ppc/syslib/mv64x60.c b/arch/ppc/syslib/mv64x60.c
index a781c50d2f4c..94ea346b7b4b 100644
--- a/arch/ppc/syslib/mv64x60.c
+++ b/arch/ppc/syslib/mv64x60.c
@@ -19,6 +19,7 @@
#include <linux/string.h>
#include <linux/spinlock.h>
#include <linux/mv643xx.h>
+#include <linux/platform_device.h>
#include <asm/byteorder.h>
#include <asm/io.h>