diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/arm/mach-omap2/usb-fs.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/arm/mach-omap2/usb-fs.c')
| -rw-r--r-- | arch/arm/mach-omap2/usb-fs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/usb-fs.c b/arch/arm/mach-omap2/usb-fs.c index a216d88b04b5..1481078763b8 100644 --- a/arch/arm/mach-omap2/usb-fs.c +++ b/arch/arm/mach-omap2/usb-fs.c | |||
| @@ -29,18 +29,18 @@ | |||
| 29 | 29 | ||
| 30 | #include <asm/irq.h> | 30 | #include <asm/irq.h> |
| 31 | 31 | ||
| 32 | #include <plat/control.h> | ||
| 33 | #include <plat/usb.h> | 32 | #include <plat/usb.h> |
| 34 | #include <plat/board.h> | 33 | #include <plat/board.h> |
| 35 | 34 | ||
| 35 | #include "control.h" | ||
| 36 | #include "mux.h" | ||
| 37 | |||
| 36 | #define INT_USB_IRQ_GEN INT_24XX_USB_IRQ_GEN | 38 | #define INT_USB_IRQ_GEN INT_24XX_USB_IRQ_GEN |
| 37 | #define INT_USB_IRQ_NISO INT_24XX_USB_IRQ_NISO | 39 | #define INT_USB_IRQ_NISO INT_24XX_USB_IRQ_NISO |
| 38 | #define INT_USB_IRQ_ISO INT_24XX_USB_IRQ_ISO | 40 | #define INT_USB_IRQ_ISO INT_24XX_USB_IRQ_ISO |
| 39 | #define INT_USB_IRQ_HGEN INT_24XX_USB_IRQ_HGEN | 41 | #define INT_USB_IRQ_HGEN INT_24XX_USB_IRQ_HGEN |
| 40 | #define INT_USB_IRQ_OTG INT_24XX_USB_IRQ_OTG | 42 | #define INT_USB_IRQ_OTG INT_24XX_USB_IRQ_OTG |
| 41 | 43 | ||
| 42 | #include "mux.h" | ||
| 43 | |||
| 44 | #if defined(CONFIG_ARCH_OMAP2) | 44 | #if defined(CONFIG_ARCH_OMAP2) |
| 45 | 45 | ||
| 46 | #ifdef CONFIG_USB_GADGET_OMAP | 46 | #ifdef CONFIG_USB_GADGET_OMAP |