diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-30 11:39:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-30 11:39:56 -0400 |
| commit | 1dd465cac8d3ba18a9840d032f6604147269c031 (patch) | |
| tree | 78f00fdeae26d018def75e7517aa50e56f4994df /drivers/usb | |
| parent | a2218cac0aacecbecebd3cabc43cc8a4a09cecbb (diff) | |
| parent | 217874feed0d3a6543a6b7127782f4a08bffd731 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'drivers/usb')
| -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-s3c2410.c | 1 |
3 files changed, 0 insertions, 4 deletions
diff --git a/drivers/usb/host/ohci-lh7a404.c b/drivers/usb/host/ohci-lh7a404.c index 817620d73841..859aca7be753 100644 --- a/drivers/usb/host/ohci-lh7a404.c +++ b/drivers/usb/host/ohci-lh7a404.c | |||
| @@ -17,8 +17,6 @@ | |||
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <asm/hardware.h> | 19 | #include <asm/hardware.h> |
| 20 | #include <asm/mach-types.h> | ||
| 21 | #include <asm/arch/hardware.h> | ||
| 22 | 20 | ||
| 23 | 21 | ||
| 24 | extern int usb_disabled(void); | 22 | extern int usb_disabled(void); |
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c index 5cde76faab93..d8f3ba7ad52e 100644 --- a/drivers/usb/host/ohci-omap.c +++ b/drivers/usb/host/ohci-omap.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <asm/io.h> | 18 | #include <asm/io.h> |
| 19 | #include <asm/mach-types.h> | 19 | #include <asm/mach-types.h> |
| 20 | 20 | ||
| 21 | #include <asm/arch/hardware.h> | ||
| 22 | #include <asm/arch/mux.h> | 21 | #include <asm/arch/mux.h> |
| 23 | #include <asm/arch/irqs.h> | 22 | #include <asm/arch/irqs.h> |
| 24 | #include <asm/arch/gpio.h> | 23 | #include <asm/arch/gpio.h> |
diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c index 3d9bcf78a9a4..da7d5478f74d 100644 --- a/drivers/usb/host/ohci-s3c2410.c +++ b/drivers/usb/host/ohci-s3c2410.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <asm/hardware.h> | 22 | #include <asm/hardware.h> |
| 23 | #include <asm/mach-types.h> | ||
| 24 | #include <asm/hardware/clock.h> | 23 | #include <asm/hardware/clock.h> |
| 25 | #include <asm/arch/usb-control.h> | 24 | #include <asm/arch/usb-control.h> |
| 26 | 25 | ||