diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-22 09:22:33 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-22 10:07:21 +0200 |
| commit | e3a66aa33a8f06924f67770e15c22a5c52df314e (patch) | |
| tree | fb8786f1300bdce8f6fc7462e3fd5699e057dd24 /arch/arm/mach-mv78xx0 | |
| parent | ARM: msm: Move core.h contents into common.h (diff) | |
| parent | ARM: spear: move platform_data definitions (diff) | |
| download | linux-e3a66aa33a8f06924f67770e15c22a5c52df314e.tar.xz linux-e3a66aa33a8f06924f67770e15c22a5c52df314e.zip | |
Merge branch 'multiplatform/platform-data' into next/multiplatform
* multiplatform/platform-data:
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
Conflicts due to removed files:
arch/arm/mach-tegra/board-harmony.c
arch/arm/mach-tegra/board-trimslice.c
Conflicts due to code removal:
arch/arm/mach-tegra/board-paz00.c
Context conflicts in:
drivers/mmc/host/sdhci-tegra.c
drivers/net/irda/pxaficp_ir.c
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-mv78xx0')
| -rw-r--r-- | arch/arm/mach-mv78xx0/common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mv78xx0/common.c b/arch/arm/mach-mv78xx0/common.c index 6b0c38735527..a6f3cd21e8c2 100644 --- a/arch/arm/mach-mv78xx0/common.c +++ b/arch/arm/mach-mv78xx0/common.c @@ -20,8 +20,8 @@ #include <mach/mv78xx0.h> #include <mach/bridge-regs.h> #include <plat/cache-feroceon-l2.h> -#include <plat/ehci-orion.h> -#include <plat/orion_nand.h> +#include <linux/platform_data/usb-ehci-orion.h> +#include <linux/platform_data/mtd-orion_nand.h> #include <plat/time.h> #include <plat/common.h> #include <plat/addr-map.h> |