diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-31 07:32:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-31 07:32:56 -0800 |
| commit | 4fd5f8267dd37aaebadfabe71d9c808821eea05a (patch) | |
| tree | 50774592eaba942cf378fca731d307f901b737b7 /drivers/usb/host | |
| parent | Input: adbhid - fix OOPS introduced by dynalloc conversion (diff) | |
| parent | [DRIVER MODEL] Add missing driver_unregister to IMX serial driver (diff) | |
| download | linux-dev-4fd5f8267dd37aaebadfabe71d9c808821eea05a.tar.xz linux-dev-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/usb/host')
| -rw-r--r-- | drivers/usb/host/isp116x-hcd.c | 1 | ||||
| -rw-r--r-- | drivers/usb/host/ohci-au1xxx.c | 2 | ||||
| -rw-r--r-- | drivers/usb/host/ohci-lh7a404.c | 2 | ||||
| -rw-r--r-- | drivers/usb/host/ohci-omap.c | 1 | ||||
| -rw-r--r-- | drivers/usb/host/ohci-ppc-soc.c | 2 | ||||
| -rw-r--r-- | drivers/usb/host/ohci-pxa27x.c | 2 | ||||
| -rw-r--r-- | drivers/usb/host/ohci-s3c2410.c | 2 | ||||
| -rw-r--r-- | drivers/usb/host/sl811-hcd.c | 1 | ||||
| -rw-r--r-- | drivers/usb/host/sl811_cs.c | 1 |
9 files changed, 14 insertions, 0 deletions
diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c index ddb8fc591466..f9c3f5b8dd1c 100644 --- a/drivers/usb/host/isp116x-hcd.c +++ b/drivers/usb/host/isp116x-hcd.c @@ -70,6 +70,7 @@ #include <linux/interrupt.h> #include <linux/usb.h> #include <linux/usb_isp116x.h> +#include <linux/platform_device.h> #include <asm/io.h> #include <asm/irq.h> diff --git a/drivers/usb/host/ohci-au1xxx.c b/drivers/usb/host/ohci-au1xxx.c index a277e258eb6c..f0c78cf14b6c 100644 --- a/drivers/usb/host/ohci-au1xxx.c +++ b/drivers/usb/host/ohci-au1xxx.c @@ -18,6 +18,8 @@ * This file is licenced under the GPL. */ +#include <linux/platform_device.h> + #include <asm/mach-au1x00/au1000.h> #define USBH_ENABLE_BE (1<<0) diff --git a/drivers/usb/host/ohci-lh7a404.c b/drivers/usb/host/ohci-lh7a404.c index 238fa4ade615..336c766c6e29 100644 --- a/drivers/usb/host/ohci-lh7a404.c +++ b/drivers/usb/host/ohci-lh7a404.c @@ -16,6 +16,8 @@ * This file is licenced under the GPL. */ +#include <linux/platform_device.h> + #include <asm/hardware.h> diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c index 49815ec4b842..e46cc540cf4d 100644 --- a/drivers/usb/host/ohci-omap.c +++ b/drivers/usb/host/ohci-omap.c @@ -16,6 +16,7 @@ #include <linux/signal.h> /* SA_INTERRUPT */ #include <linux/jiffies.h> +#include <linux/platform_device.h> #include <asm/hardware.h> #include <asm/io.h> diff --git a/drivers/usb/host/ohci-ppc-soc.c b/drivers/usb/host/ohci-ppc-soc.c index 4832e57ae579..92cf6f4a1374 100644 --- a/drivers/usb/host/ohci-ppc-soc.c +++ b/drivers/usb/host/ohci-ppc-soc.c @@ -14,6 +14,8 @@ * This file is licenced under the GPL. */ +#include <linux/platform_device.h> + /* configure so an HC device and id are always provided */ /* always called with process context; sleeping is OK */ diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c index f4a4aeda40b7..59e20568e8f9 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> diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c index fab420a2ce71..ee1fc605b402 100644 --- a/drivers/usb/host/ohci-s3c2410.c +++ b/drivers/usb/host/ohci-s3c2410.c @@ -19,6 +19,8 @@ * This file is licenced under the GPL. */ +#include <linux/platform_device.h> + #include <asm/hardware.h> #include <asm/hardware/clock.h> #include <asm/arch/usb-control.h> diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c index 40169d9cf2b1..5607c0ae6835 100644 --- a/drivers/usb/host/sl811-hcd.c +++ b/drivers/usb/host/sl811-hcd.c @@ -54,6 +54,7 @@ #include <linux/interrupt.h> #include <linux/usb.h> #include <linux/usb_sl811.h> +#include <linux/platform_device.h> #include <asm/io.h> #include <asm/irq.h> diff --git a/drivers/usb/host/sl811_cs.c b/drivers/usb/host/sl811_cs.c index 38aebe361ca1..e73faf831b24 100644 --- a/drivers/usb/host/sl811_cs.c +++ b/drivers/usb/host/sl811_cs.c @@ -19,6 +19,7 @@ #include <linux/string.h> #include <linux/timer.h> #include <linux/ioport.h> +#include <linux/platform_device.h> #include <pcmcia/cs_types.h> #include <pcmcia/cs.h> |