Messages in this thread | | | Date | Thu, 25 Aug 2011 13:30:14 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the pm tree with the arm tree |
| |
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in arch/arm/mach-shmobile/board-ap4evb.c between commit 9b742024026c ("ARM: mach-shmobile: Setup consistent dma size at boot time") from the arm tree and commit 2f82df20d71c ("PM: Move clock-related definitions and headers to separate file") from the pm tree.
Just context changes. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-shmobile/board-ap4evb.c index ec8f9d9,4a21a50..0000000 --- a/arch/arm/mach-shmobile/board-ap4evb.c +++ b/arch/arm/mach-shmobile/board-ap4evb.c @@@ -42,7 -42,7 +42,8 @@@ #include <linux/leds.h> #include <linux/input/sh_keysc.h> #include <linux/usb/r8a66597.h> +#include <linux/dma-mapping.h> + #include <linux/pm_clock.h> #include <media/sh_mobile_ceu.h> #include <media/sh_mobile_csi2.h>
| |