diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2012-09-14 02:14:45 -0400 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2012-10-14 22:05:43 -0400 |
| commit | 50f2de61269bbe2f40bead1969a9594fa8599b93 (patch) | |
| tree | 842f17cd25c5350f602a3fb31960e34bb3855b21 /arch/arm/mach-imx/ehci-imx31.c | |
| parent | 6dde5ac5220b3b9c28f82f291b64eca3e5ebe80d (diff) | |
ARM: imx: include hardware.h rather than mach/hardware.h
It moves a bunch of header files included in hardware.h and itself
from mach-imx/include/mach to mach-imx, and updates users to include
hardware.h rather than mach/hardware.h. The files in mach-imx/devices
will need to include "../hardware.h".
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-imx/ehci-imx31.c')
| -rw-r--r-- | arch/arm/mach-imx/ehci-imx31.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/ehci-imx31.c b/arch/arm/mach-imx/ehci-imx31.c index 9a880c78af34..05de4e1e39d7 100644 --- a/arch/arm/mach-imx/ehci-imx31.c +++ b/arch/arm/mach-imx/ehci-imx31.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 MX31_OTG_SIC_SHIFT 29 | 24 | #define MX31_OTG_SIC_SHIFT 29 |