Hi Kukjin,
Today's linux-next merge of the samsung tree got a conflict in
drivers/irqchip/irq-s3c24xx.c between commit de88cbb7b244 ("arm: Move
chained_irq_(enter|exit) to a generic file") from the arm-soc tree (where
it is called arch/arm/mach-s3c24xx/irq.c) and commit f0774d41da0e
("irqchip: s3c24xx: add devicetree support") from the samsung 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 drivers/irqchip/irq-s3c24xx.c index 8296d94,5e40b34..0000000 --- a/drivers/irqchip/irq-s3c24xx.c +++ b/drivers/irqchip/irq-s3c24xx.c @@@ -25,8 -25,11 +25,12 @@@ #include <linux/ioport.h> #include <linux/device.h> #include <linux/irqdomain.h> +#include <linux/irqchip/chained_irq.h> + #include <linux/of.h> + #include <linux/of_irq.h> + #include <linux/of_address.h> + #include <asm/exception.h> #include <asm/mach/irq.h> #include <mach/regs-irq.h>
pgp5ZaRPVbbZr.pgp
Description: PGP signature
