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-vt8500/devices.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-vt8500/devices.c')
| -rw-r--r-- | arch/arm/mach-vt8500/devices.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-vt8500/devices.c b/arch/arm/mach-vt8500/devices.c index 1fcdc36b358d..82b4bcedffba 100644 --- a/arch/arm/mach-vt8500/devices.c +++ b/arch/arm/mach-vt8500/devices.c | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | 23 | ||
| 24 | #include <asm/mach/arch.h> | 24 | #include <asm/mach/arch.h> |
| 25 | 25 | ||
| 26 | #include <mach/vt8500fb.h> | 26 | #include <linux/platform_data/video-vt8500lcdfb.h> |
| 27 | #include <mach/i8042.h> | 27 | #include <mach/i8042.h> |
| 28 | #include "devices.h" | 28 | #include "devices.h" |
| 29 | 29 | ||