diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-04 23:17:25 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-04 23:17:25 -0400 |
| commit | 54d69df5849ec2e660aa12ac75562618c10fb499 (patch) | |
| tree | adbfb8bcc7cc73b83bf2b784fa331911ba03573a /arch/arm/mach-s5pv210/mach-smdkv210.c | |
| parent | ad932bb6b549722a561fb31ac2fa50dcbcb3e36b (diff) | |
| parent | 46f2007c1efadfa4071c17e75f140c47f09293de (diff) | |
Merge branch 'late/kirkwood' into late/soc
Merge in the late Kirkwood branch with the OMAP late branch for upstream
submission.
Final contents described in shared tag.
Fixup remove/change conflicts in arch/arm/mach-omap2/devices.c and
drivers/spi/spi-omap2-mcspi.c.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-s5pv210/mach-smdkv210.c')
| -rw-r--r-- | arch/arm/mach-s5pv210/mach-smdkv210.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c b/arch/arm/mach-s5pv210/mach-smdkv210.c index 918b23d71fdf..7d6fab420508 100644 --- a/arch/arm/mach-s5pv210/mach-smdkv210.c +++ b/arch/arm/mach-s5pv210/mach-smdkv210.c | |||
| @@ -38,9 +38,9 @@ | |||
| 38 | #include <plat/devs.h> | 38 | #include <plat/devs.h> |
| 39 | #include <plat/cpu.h> | 39 | #include <plat/cpu.h> |
| 40 | #include <plat/adc.h> | 40 | #include <plat/adc.h> |
| 41 | #include <plat/ts.h> | 41 | #include <linux/platform_data/touchscreen-s3c2410.h> |
| 42 | #include <plat/ata.h> | 42 | #include <linux/platform_data/ata-samsung_cf.h> |
| 43 | #include <plat/iic.h> | 43 | #include <linux/platform_data/i2c-s3c2410.h> |
| 44 | #include <plat/keypad.h> | 44 | #include <plat/keypad.h> |
| 45 | #include <plat/pm.h> | 45 | #include <plat/pm.h> |
| 46 | #include <plat/fb.h> | 46 | #include <plat/fb.h> |