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-pxa/em-x270.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-pxa/em-x270.c')
| -rw-r--r-- | arch/arm/mach-pxa/em-x270.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c index 97f82ad341bf..1b6411439ec8 100644 --- a/arch/arm/mach-pxa/em-x270.c +++ b/arch/arm/mach-pxa/em-x270.c | |||
| @@ -42,11 +42,11 @@ | |||
| 42 | #include <mach/pxa27x.h> | 42 | #include <mach/pxa27x.h> |
| 43 | #include <mach/pxa27x-udc.h> | 43 | #include <mach/pxa27x-udc.h> |
| 44 | #include <mach/audio.h> | 44 | #include <mach/audio.h> |
| 45 | #include <mach/pxafb.h> | 45 | #include <linux/platform_data/video-pxafb.h> |
| 46 | #include <mach/ohci.h> | 46 | #include <linux/platform_data/usb-ohci-pxa27x.h> |
| 47 | #include <mach/mmc.h> | 47 | #include <linux/platform_data/mmc-pxamci.h> |
| 48 | #include <plat/pxa27x_keypad.h> | 48 | #include <linux/platform_data/keypad-pxa27x.h> |
| 49 | #include <mach/camera.h> | 49 | #include <linux/platform_data/camera-pxa.h> |
| 50 | 50 | ||
| 51 | #include "generic.h" | 51 | #include "generic.h" |
| 52 | #include "devices.h" | 52 | #include "devices.h" |