Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-omap1/board-palmtt.c between commit ddba6c7f7ec6 ("OMAP1: pass LCD config with omapfb_set_lcd_config()") from the omap_dss2 tree and commit 2e3ee9f45b3c ("ARM: OMAP1: Move most of plat/io.h into local iomap.h") from the arm-soc tree. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx diff --cc arch/arm/mach-omap1/board-palmtt.c index b63350b,acd1f36..0000000 --- a/arch/arm/mach-omap1/board-palmtt.c +++ b/arch/arm/mach-omap1/board-palmtt.c @@@ -24,9 -24,9 +24,10 @@@ #include <linux/mtd/partitions.h> #include <linux/mtd/physmap.h> #include <linux/leds.h> +#include <linux/omapfb.h> + #include <linux/spi/spi.h> + #include <linux/spi/ads7846.h> - #include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h>
Attachment:
pgpU_jEcwNOki.pgp
Description: PGP signature