diff options
| author | Paul Walmsley <paul@pwsan.com> | 2010-10-08 11:40:20 -0600 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2010-10-08 11:40:20 -0600 |
| commit | 4814ced5116e3b73dc4f63eec84999739fc8ed11 (patch) | |
| tree | a70a0a532d3c552c76c6a0e4dce13e5c492bd772 /arch/arm/mach-omap2/usb-fs.c | |
| parent | aa218dafd7b37ba92fcfdd6d5c8d459772f88042 (diff) | |
| download | op-kernel-dev-4814ced5116e3b73dc4f63eec84999739fc8ed11.zip op-kernel-dev-4814ced5116e3b73dc4f63eec84999739fc8ed11.tar.gz | |
OMAP: control: move plat-omap/control.h to mach-omap2/control.h
Only OMAP2+ platforms have the System Control Module (SCM) IP block.
In the past, we've kept the SCM header file in plat-omap. This has
led to abuse - device drivers including it; includes being added that
create implicit dependencies on OMAP2+ builds; etc.
In response, move the SCM headers into mach-omap2/.
As part of this, remove the direct SCM access from the OMAP UDC
driver. It was clearly broken. The UDC code needs an indepth review for
use on OMAP2+ chips.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Cory Maccarrone <darkstar6262@gmail.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
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 a216d88..1481078 100644 --- a/arch/arm/mach-omap2/usb-fs.c +++ b/arch/arm/mach-omap2/usb-fs.c @@ -29,18 +29,18 @@ #include <asm/irq.h> -#include <plat/control.h> #include <plat/usb.h> #include <plat/board.h> +#include "control.h" +#include "mux.h" + #define INT_USB_IRQ_GEN INT_24XX_USB_IRQ_GEN #define INT_USB_IRQ_NISO INT_24XX_USB_IRQ_NISO #define INT_USB_IRQ_ISO INT_24XX_USB_IRQ_ISO #define INT_USB_IRQ_HGEN INT_24XX_USB_IRQ_HGEN #define INT_USB_IRQ_OTG INT_24XX_USB_IRQ_OTG -#include "mux.h" - #if defined(CONFIG_ARCH_OMAP2) #ifdef CONFIG_USB_GADGET_OMAP |
