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/palmtc.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/palmtc.c')
| -rw-r--r-- | arch/arm/mach-pxa/palmtc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/palmtc.c b/arch/arm/mach-pxa/palmtc.c index e2d97eed07a7..ca924cfedfc0 100644 --- a/arch/arm/mach-pxa/palmtc.c +++ b/arch/arm/mach-pxa/palmtc.c | |||
| @@ -34,9 +34,9 @@ | |||
| 34 | #include <mach/pxa25x.h> | 34 | #include <mach/pxa25x.h> |
| 35 | #include <mach/audio.h> | 35 | #include <mach/audio.h> |
| 36 | #include <mach/palmtc.h> | 36 | #include <mach/palmtc.h> |
| 37 | #include <mach/mmc.h> | 37 | #include <linux/platform_data/mmc-pxamci.h> |
| 38 | #include <mach/pxafb.h> | 38 | #include <linux/platform_data/video-pxafb.h> |
| 39 | #include <mach/irda.h> | 39 | #include <linux/platform_data/irda-pxaficp.h> |
| 40 | #include <mach/udc.h> | 40 | #include <mach/udc.h> |
| 41 | 41 | ||
| 42 | #include "generic.h" | 42 | #include "generic.h" |