commit | 4fd5f8267dd37aaebadfabe71d9c808821eea05a | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@g5.osdl.org> | Mon Oct 31 07:32:56 2005 -0800 |
committer | Linus Torvalds <torvalds@g5.osdl.org> | Mon Oct 31 07:32:56 2005 -0800 |
tree | 50774592eaba942cf378fca731d307f901b737b7 | |
parent | eb16292ba8a6655a560ab10a7d73a7816f0c0ac0 [diff] [blame] | |
parent | 8576762ff5d109b841fcf4e7d3883e0cf794f3cf [diff] [blame] |
Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel Manual #include fixups for clashes - there may be some unnecessary
diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c index f4a4aed..59e2056 100644 --- a/drivers/usb/host/ohci-pxa27x.c +++ b/drivers/usb/host/ohci-pxa27x.c
@@ -21,6 +21,8 @@ #include <linux/device.h> #include <linux/signal.h> +#include <linux/platform_device.h> + #include <asm/mach-types.h> #include <asm/hardware.h> #include <asm/arch/pxa-regs.h>