diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-11-16 16:59:17 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-11-16 16:59:17 +0100 |
commit | db2f95de7e6ab3d5cd7cc047bb09eb9ada07e3ba (patch) | |
tree | 46543712dbbb15075f7532621b0311f1de653e57 /arch/arm/mach-imx/ehci-imx35.c | |
parent | 1bf0bc1e050fc425cc776b10d3ce8754389aabbe (diff) | |
parent | d6aef84a48fa54ac606ae719fcd125199939f43d (diff) | |
download | linux-3.10-db2f95de7e6ab3d5cd7cc047bb09eb9ada07e3ba.tar.gz linux-3.10-db2f95de7e6ab3d5cd7cc047bb09eb9ada07e3ba.tar.bz2 linux-3.10-db2f95de7e6ab3d5cd7cc047bb09eb9ada07e3ba.zip |
Merge tag 'imx-soc' of git://git.pengutronix.de/git/imx/linux-2.6 into next/soc
From Sascha Hauer <s.hauer@pengutronix.de>:
ARM i.MX SoC updates
based on imx-multiplatform branch.
* tag 'imx-soc' of git://git.pengutronix.de/git/imx/linux-2.6:
ARM i.MX51 babbage: Add display support
ARM i.MX6: Add IPU support
ARM i.MX51: Add IPU support
ARM i.MX53: Add IPU support
ARM i.MX5: switch IPU clk support to devicetree bindings
ARM i.MX6: fix ldb_di_sel mux
ARM i.MX51: setup MIPI during startup
mx2_camera: Fix regression caused by clock conversion
ARM: clk-imx27: Add missing clock for mx2-camera
ARM i.MX27: Fix low reference clock path
ARM: dts: imx27-3ds: Remove local watchdog inclusion
watchdog: Support imx watchdog on SOC_IMX53
ARM: mach-imx: Support for DryIce RTC in i.MX53
ARM : i.MX27 : split code for allocation of ressources of camera and eMMA
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-imx/ehci-imx35.c')
-rw-r--r-- | arch/arm/mach-imx/ehci-imx35.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/ehci-imx35.c b/arch/arm/mach-imx/ehci-imx35.c index 779e16eb65c..a596f709a93 100644 --- a/arch/arm/mach-imx/ehci-imx35.c +++ b/arch/arm/mach-imx/ehci-imx35.c @@ -15,10 +15,10 @@ #include <linux/platform_device.h> #include <linux/io.h> - -#include <mach/hardware.h> #include <linux/platform_data/usb-ehci-mxc.h> +#include "hardware.h" + #define USBCTRL_OTGBASE_OFFSET 0x600 #define MX35_OTG_SIC_SHIFT 29 |