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-s5pc100/mach-smdkc100.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-s5pc100/mach-smdkc100.c')
-rw-r--r-- | arch/arm/mach-s5pc100/mach-smdkc100.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-s5pc100/mach-smdkc100.c b/arch/arm/mach-s5pc100/mach-smdkc100.c index 0c3ae38d27ca..5d2c0934928b 100644 --- a/arch/arm/mach-s5pc100/mach-smdkc100.c +++ b/arch/arm/mach-s5pc100/mach-smdkc100.c | |||
@@ -44,12 +44,12 @@ | |||
44 | #include <plat/devs.h> | 44 | #include <plat/devs.h> |
45 | #include <plat/cpu.h> | 45 | #include <plat/cpu.h> |
46 | #include <plat/fb.h> | 46 | #include <plat/fb.h> |
47 | #include <plat/iic.h> | 47 | #include <linux/platform_data/i2c-s3c2410.h> |
48 | #include <plat/ata.h> | 48 | #include <linux/platform_data/ata-samsung_cf.h> |
49 | #include <plat/adc.h> | 49 | #include <plat/adc.h> |
50 | #include <plat/keypad.h> | 50 | #include <plat/keypad.h> |
51 | #include <plat/ts.h> | 51 | #include <linux/platform_data/touchscreen-s3c2410.h> |
52 | #include <plat/audio.h> | 52 | #include <linux/platform_data/asoc-s3c.h> |
53 | #include <plat/backlight.h> | 53 | #include <plat/backlight.h> |
54 | #include <plat/regs-fb-v4.h> | 54 | #include <plat/regs-fb-v4.h> |
55 | 55 | ||