diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-10-05 21:32:05 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-10-05 21:32:05 -0400 |
| commit | eabe7b01c249c9d8166a1a10bb6effce2b3de665 (patch) | |
| tree | 31f1ca0c0f6d027839d3d5915cf890400a52168a /arch/arm/mach-imx/ehci-imx5.c | |
| parent | c421a1e418b191c8fb632dc5261b61acec6541ca (diff) | |
| parent | 436d42c61c3eef1d02256174c8615046c61a28ad (diff) | |
Merge branch 'samsung_platform_data' into staging/for_v3.7
* samsung_platform_data:
ARM: samsung: move platform_data definitions
ARM: orion: move platform_data definitions
ARM: nomadik: move platform_data definitions
ARM: w90x900: move platform_data definitions
ARM: vt8500: move platform_data definitions
ARM: tegra: move sdhci platform_data definition
ARM: sa1100: move platform_data definitions
ARM: pxa: move platform_data definitions
ARM: netx: move platform_data definitions
ARM: msm: move platform_data definitions
ARM: imx: move platform_data definitions
ARM: ep93xx: move platform_data definitions
ARM: davinci: move platform_data definitions
ARM: at91: move platform_data definitions
Diffstat (limited to 'arch/arm/mach-imx/ehci-imx5.c')
| -rw-r--r-- | arch/arm/mach-imx/ehci-imx5.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/ehci-imx5.c b/arch/arm/mach-imx/ehci-imx5.c index a6a4afb0ad62..cf8d00e5cce1 100644 --- a/arch/arm/mach-imx/ehci-imx5.c +++ b/arch/arm/mach-imx/ehci-imx5.c | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | #include <linux/io.h> | 17 | #include <linux/io.h> |
| 18 | 18 | ||
| 19 | #include <mach/hardware.h> | 19 | #include <mach/hardware.h> |
| 20 | #include <mach/mxc_ehci.h> | 20 | #include <linux/platform_data/usb-ehci-mxc.h> |
| 21 | 21 | ||
| 22 | #define MXC_OTG_OFFSET 0 | 22 | #define MXC_OTG_OFFSET 0 |
| 23 | #define MXC_H1_OFFSET 0x200 | 23 | #define MXC_H1_OFFSET 0x200 |