Hi Tomi, Today's linux-next merge of the omap_dss2 tree got a conflict in arch/arm/mach-omap2/board-4430sdp.c between commit 8f5b5a41ebc7 ("ARM: OMAP: Introduce SoC specific early_init") from the arm-soc tree and commit 58282610da02 ("OMAP: 4430SDP: Remove unneeded lcd config") from the omap_dss2 tree. Just context changes. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx diff --cc arch/arm/mach-omap2/board-4430sdp.c index f3917b3,d3874a6..0000000 --- a/arch/arm/mach-omap2/board-4430sdp.c +++ b/arch/arm/mach-omap2/board-4430sdp.c @@@ -381,14 -379,12 +379,6 @@@ static struct platform_device *sdp4430_ &sdp4430_vbat, }; - static struct omap_lcd_config sdp4430_lcd_config __initdata = { - .ctrl_name = "internal", - }; - - static struct omap_board_config_kernel sdp4430_config[] __initdata = { - { OMAP_TAG_LCD, &sdp4430_lcd_config }, - }; - -static void __init omap_4430sdp_init_early(void) -{ - omap2_init_common_infrastructure(); - omap2_init_common_devices(NULL, NULL); -} - static struct omap_musb_board_data musb_board_data = { .interface_type = MUSB_INTERFACE_UTMI, .mode = MUSB_OTG, -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html