diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-11-16 17:11:46 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-11-16 17:11:46 +0100 |
| commit | bac2f668864eca45b702ee394bef4c5f3a86658c (patch) | |
| tree | 9b82100e2f447ae2b3b20f4a935b8020c885adcf /drivers/usb/host | |
| parent | cff9f37a1e7b2565f254b5ab40c3213cc0f823a1 (diff) | |
| parent | 632506a21a3b5f0596e89d55cda6b482bec331a3 (diff) | |
| download | linux-3.10-bac2f668864eca45b702ee394bef4c5f3a86658c.tar.gz linux-3.10-bac2f668864eca45b702ee394bef4c5f3a86658c.tar.bz2 linux-3.10-bac2f668864eca45b702ee394bef4c5f3a86658c.zip | |
Merge tag 'imx-dt' of git://git.pengutronix.de/git/imx/linux-2.6 into next/dt
From Sascha Hauer <s.hauer@pengutronix.de>:
ARM i.MX dt updates for 3.8
* tag 'imx-dt' of git://git.pengutronix.de/git/imx/linux-2.6:
Add device tree file for the armadeus apf27
ARM i.MX: Add Ka-Ro TX25 devicetree
ARM i.MX25: Add devicetree
ARM i.MX25: Add devicetree support
ARM i.MX25: Add missing clock gates
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/usb/host')
| -rw-r--r-- | drivers/usb/host/ehci-mxc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c index 4a08fc0b27c..8e58a5fa199 100644 --- a/drivers/usb/host/ehci-mxc.c +++ b/drivers/usb/host/ehci-mxc.c @@ -24,7 +24,6 @@ #include <linux/usb/ulpi.h> #include <linux/slab.h> -#include <mach/hardware.h> #include <linux/platform_data/usb-ehci-mxc.h> #include <asm/mach-types.h> |