diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-12 12:08:12 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-12 12:08:12 +0100 |
| commit | 53640f41b97792b0889bb70f26f99c06743162a1 (patch) | |
| tree | 3a0358208775f29f9e319b506ce849c5dbdc1a06 /drivers/usb | |
| parent | 77b67063bb6bce6d475e910d3b886a606d0d91f7 (diff) | |
| parent | 68b25325a7fd290b5e472bba0df9cbe8c1a81d8f (diff) | |
| download | linux-stable-53640f41b97792b0889bb70f26f99c06743162a1.tar.gz linux-stable-53640f41b97792b0889bb70f26f99c06743162a1.tar.bz2 linux-stable-53640f41b97792b0889bb70f26f99c06743162a1.zip | |
Merge remote-tracking branch 'arm-soc/imx/multiplatform' into imx25-dt
Diffstat (limited to 'drivers/usb')
| -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 4a08fc0b27c9..8e58a5fa1994 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> |