aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/ehci-imx27.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-11-16 10:21:27 -0500
committerSascha Hauer <s.hauer@pengutronix.de>2012-11-16 10:21:27 -0500
commit89a4150331bc07014256714678ce8e9b238fc145 (patch)
tree3a0358208775f29f9e319b506ce849c5dbdc1a06 /arch/arm/mach-imx/ehci-imx27.c
parent77b67063bb6bce6d475e910d3b886a606d0d91f7 (diff)
parent68b25325a7fd290b5e472bba0df9cbe8c1a81d8f (diff)
Merge remote-tracking branch 'arm-soc/imx/multiplatform' into x
Diffstat (limited to 'arch/arm/mach-imx/ehci-imx27.c')
-rw-r--r--arch/arm/mach-imx/ehci-imx27.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/ehci-imx27.c b/arch/arm/mach-imx/ehci-imx27.c
index cd6e1f81508d..448d9115539d 100644
--- a/arch/arm/mach-imx/ehci-imx27.c
+++ b/arch/arm/mach-imx/ehci-imx27.c
@@ -15,10 +15,10 @@
15 15
16#include <linux/platform_device.h> 16#include <linux/platform_device.h>
17#include <linux/io.h> 17#include <linux/io.h>
18
19#include <mach/hardware.h>
20#include <linux/platform_data/usb-ehci-mxc.h> 18#include <linux/platform_data/usb-ehci-mxc.h>
21 19
20#include "hardware.h"
21
22#define USBCTRL_OTGBASE_OFFSET 0x600 22#define USBCTRL_OTGBASE_OFFSET 0x600
23 23
24#define MX27_OTG_SIC_SHIFT 29 24#define MX27_OTG_SIC_SHIFT 29