Hi Ralf,
Today's linux-next merge of the mips tree got conflicts in
drivers/irqchip/Kconfig and drivers/irqchip/Makefile between commit
19efb55b79f3 ("h8300: IRQ chip driver") from the h8300 tree and commit
a7c64f0e29a6 ("MIPS/IRQCHIP: Move Ingenic SoC intc driver to
drivers/irqchip") from the mips tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc drivers/irqchip/Kconfig
index 8a7d7807b596,746daf37454c..000000000000
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@@ -160,10 -164,7 +165,15 @@@ config MIPS_GI
bool
select MIPS_CM
+ config INGENIC_IRQ
+ bool
+ depends on MACH_INGENIC
+ default y
++
+config RENESAS_H8300H_INTC
+ bool
+ select IRQ_DOMAIN
+
+config RENESAS_H8S_INTC
+ bool
- select IRQ_DOMAIN
++ select IRQ_DOMAIN
diff --cc drivers/irqchip/Makefile
index f8efb7087760,db014e8e12c9..000000000000
--- a/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@@ -47,5 -48,4 +48,6 @@@ obj-$(CONFIG_KEYSTONE_IRQ) += irq-keys
obj-$(CONFIG_MIPS_GIC) += irq-mips-gic.o
obj-$(CONFIG_ARCH_MEDIATEK) += irq-mtk-sysirq.o
obj-$(CONFIG_ARCH_DIGICOLOR) += irq-digicolor.o
+ obj-$(CONFIG_INGENIC_IRQ) += irq-ingenic.o
+obj-$(CONFIG_RENESAS_H8300H_INTC) += irq-renesas-h8300h.o
+obj-$(CONFIG_RENESAS_H8S_INTC) += irq-renesas-h8s.o
Attachment:
pgph7VgfSa5ld.pgp
Description: OpenPGP digital signature
