Messages in this thread | | | Date | Mon, 24 Sep 2012 19:17:57 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the arm-soc tree with the fbdev tree |
| |
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-s3c64xx/mach-real6410.c between commit 5a213a55c6d3 ("include/video: move fimd register headers from platform to include/video") from the fbdev tree and commit 436d42c61c3e ("ARM: samsung: move platform_data definitions") from the arm-soc tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-s3c64xx/mach-real6410.c index 76d3ffb,6daca20..0000000 --- a/arch/arm/mach-s3c64xx/mach-real6410.c +++ b/arch/arm/mach-s3c64xx/mach-real6410.c @@@ -39,12 -39,12 +39,12 @@@ #include <plat/cpu.h> #include <plat/devs.h> #include <plat/fb.h> - #include <plat/nand.h> + #include <linux/platform_data/mtd-nand-s3c2410.h> #include <plat/regs-serial.h> - #include <plat/ts.h> + #include <linux/platform_data/touchscreen-s3c2410.h> -#include <plat/regs-fb-v4.h> #include <video/platform_lcd.h> +#include <video/samsung_fimd.h> #include "common.h" [unhandled content-type:application/pgp-signature] | |