diff options
author | Olof Johansson <olof@lixom.net> | 2012-09-23 00:13:45 +0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-09-23 00:13:45 +0400 |
commit | b1618547bb68bd32a8b5ed20f97fa577d16b6801 (patch) | |
tree | 3a44c72206d5b9297e177c38f5c8d9ee68e901ed /arch/arm/mach-dove/common.c | |
parent | 0b177ab53d0a2303ba287ec8babfd6e1de801500 (diff) | |
parent | e3a66aa33a8f06924f67770e15c22a5c52df314e (diff) | |
download | linux-b1618547bb68bd32a8b5ed20f97fa577d16b6801.tar.xz |
Merge branch 'next/multiplatform' into late/kirkwood
By Arnd Bergmann (15) and David Brown (1)
* next/multiplatform:
ARM: msm: Move core.h contents into common.h
ARM: spear: move platform_data definitions
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-dove/common.c')
-rw-r--r-- | arch/arm/mach-dove/common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-dove/common.c index bd54d7b7ef85..950ad9533d19 100644 --- a/arch/arm/mach-dove/common.c +++ b/arch/arm/mach-dove/common.c @@ -28,7 +28,7 @@ #include <asm/mach/arch.h> #include <linux/irq.h> #include <plat/time.h> -#include <plat/ehci-orion.h> +#include <linux/platform_data/usb-ehci-orion.h> #include <plat/common.h> #include <plat/addr-map.h> #include "common.h" |