diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-22 03:22:33 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-22 04:07:21 -0400 |
| commit | e3a66aa33a8f06924f67770e15c22a5c52df314e (patch) | |
| tree | fb8786f1300bdce8f6fc7462e3fd5699e057dd24 /arch/arm/mach-s3c64xx/mach-crag6410.c | |
| parent | be2109e13fc6f017040c57615acfe1065723687b (diff) | |
| parent | 6884b680459ab850f99fc37605084187bc9888ac (diff) | |
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-s3c64xx/mach-crag6410.c')
| -rw-r--r-- | arch/arm/mach-s3c64xx/mach-crag6410.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c index 09cd81207a3f..717d675188d4 100644 --- a/arch/arm/mach-s3c64xx/mach-crag6410.c +++ b/arch/arm/mach-s3c64xx/mach-crag6410.c | |||
| @@ -61,14 +61,14 @@ | |||
| 61 | #include <plat/fb.h> | 61 | #include <plat/fb.h> |
| 62 | #include <plat/sdhci.h> | 62 | #include <plat/sdhci.h> |
| 63 | #include <plat/gpio-cfg.h> | 63 | #include <plat/gpio-cfg.h> |
| 64 | #include <plat/s3c64xx-spi.h> | 64 | #include <linux/platform_data/spi-s3c64xx.h> |
| 65 | 65 | ||
| 66 | #include <plat/keypad.h> | 66 | #include <plat/keypad.h> |
| 67 | #include <plat/clock.h> | 67 | #include <plat/clock.h> |
| 68 | #include <plat/devs.h> | 68 | #include <plat/devs.h> |
| 69 | #include <plat/cpu.h> | 69 | #include <plat/cpu.h> |
| 70 | #include <plat/adc.h> | 70 | #include <plat/adc.h> |
| 71 | #include <plat/iic.h> | 71 | #include <linux/platform_data/i2c-s3c2410.h> |
| 72 | #include <plat/pm.h> | 72 | #include <plat/pm.h> |
| 73 | 73 | ||
| 74 | #include "common.h" | 74 | #include "common.h" |