diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-05-08 21:29:27 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-05-08 21:29:27 -0400 |
| commit | d585a021c0b10b0477d6b608c53e1feb8cde0507 (patch) | |
| tree | 5ca059da1db7f15d4b29427644ad9c08270c885c /arch/arm/mach-s3c2410/usb-simtec.c | |
| parent | 84e5b0d00f8f84c4ae226be131d4bebbcee88bd3 (diff) | |
| parent | 091bf7624d1c90cec9e578a18529f615213ff847 (diff) | |
Merge commit 'v2.6.30-rc5' into next
Diffstat (limited to 'arch/arm/mach-s3c2410/usb-simtec.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/usb-simtec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/usb-simtec.c b/arch/arm/mach-s3c2410/usb-simtec.c index 6078f09b7df5..8331e8d97e20 100644 --- a/arch/arm/mach-s3c2410/usb-simtec.c +++ b/arch/arm/mach-s3c2410/usb-simtec.c | |||
| @@ -29,13 +29,14 @@ | |||
| 29 | 29 | ||
| 30 | #include <mach/bast-map.h> | 30 | #include <mach/bast-map.h> |
| 31 | #include <mach/bast-irq.h> | 31 | #include <mach/bast-irq.h> |
| 32 | #include <mach/usb-control.h> | ||
| 33 | #include <mach/regs-gpio.h> | 32 | #include <mach/regs-gpio.h> |
| 34 | 33 | ||
| 35 | #include <mach/hardware.h> | 34 | #include <mach/hardware.h> |
| 36 | #include <asm/irq.h> | 35 | #include <asm/irq.h> |
| 37 | 36 | ||
| 37 | #include <plat/usb-control.h> | ||
| 38 | #include <plat/devs.h> | 38 | #include <plat/devs.h> |
| 39 | |||
| 39 | #include "usb-simtec.h" | 40 | #include "usb-simtec.h" |
| 40 | 41 | ||
| 41 | /* control power and monitor over-current events on various Simtec | 42 | /* control power and monitor over-current events on various Simtec |