Today's linux-next merge of the mvebu tree got conflicts in arch/arm/mach-kirkwood/board-dt.c caused by commits a169e3a (ARM: kirkwood: remove custom .init_time hook) and 14867b4 (ARM: kirkwood: remove lagacy clk workarounds). I fixed them up (see below). Please verify that the resolution looks good. Thanks, Thierry --- diff --cc arch/arm/mach-kirkwood/board-dt.c index 9caa4fe,44bc6b9..ab2e586 --- a/arch/arm/mach-kirkwood/board-dt.c +++ b/arch/arm/mach-kirkwood/board-dt.c @@@ -17,14 -19,10 +19,9 @@@ #include <linux/of_net.h> #include <linux/of_platform.h> #include <linux/clk-provider.h> - #include <linux/dma-mapping.h> - #include <linux/irqchip.h> - #include <linux/kexec.h> -#include <linux/clocksource.h> + #include <linux/slab.h> #include <asm/mach/arch.h> - #include <asm/mach/map.h> #include <mach/bridge-regs.h> - #include <linux/platform_data/usb-ehci-orion.h> - #include <plat/irq.h> #include <plat/common.h> #include "common.h" -- 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
