Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
arch/arm/mach-picoxcell/common.c between commit 4b83f75a7af3 ("ARM:
picoxcell: Remove init_irq declaration in machine description") from the
arm-soc tree and commit "reboot: arm: change reboot_mode to use enum
reboot_mode" from the akpm tree.I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell [email protected] diff --cc arch/arm/mach-picoxcell/common.c index b13f51b,37add6d..0000000 --- a/arch/arm/mach-picoxcell/common.c +++ b/arch/arm/mach-picoxcell/common.c @@@ -8,8 -8,13 +8,9 @@@ * All enquiries to [email protected] */ #include <linux/delay.h> -#include <linux/irq.h> -#include <linux/irqchip.h> -#include <linux/irqdomain.h> + #include <linux/reboot.h> #include <linux/of.h> #include <linux/of_address.h> -#include <linux/of_irq.h> #include <linux/of_platform.h> #include <asm/mach/arch.h>
pgp7wX3AjUIyC.pgp
Description: PGP signature
