linux-next: manual merge of the arm-soc tree with the metag tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/irqchip/Makefile between commit 270de53f851b ("metag: Internal
and external irqchips") from the metag tree and commit a900e5d99718
("ARM: exynos: move exynos4210-combiner to drivers/irqchip") from the
arm-soc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

diff --cc drivers/irqchip/Makefile
index ff02f6b,e65fbf2..0000000
--- a/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@@ -1,6 -1,9 +1,11 @@@
+ obj-$(CONFIG_IRQCHIP)                 += irqchip.o
+ 
  obj-$(CONFIG_ARCH_BCM2835)            += irq-bcm2835.o
 +obj-$(CONFIG_METAG)                   += irq-metag-ext.o
 +obj-$(CONFIG_METAG_PERFCOUNTER_IRQS)  += irq-metag.o
+ obj-$(CONFIG_ARCH_EXYNOS)             += exynos-combiner.o
  obj-$(CONFIG_ARCH_SUNXI)              += irq-sunxi.o
- obj-$(CONFIG_VERSATILE_FPGA_IRQ)      += irq-versatile-fpga.o
  obj-$(CONFIG_ARCH_SPEAR3XX)           += spear-shirq.o
+ obj-$(CONFIG_ARM_GIC)                 += irq-gic.o
+ obj-$(CONFIG_ARM_VIC)                 += irq-vic.o
+ obj-$(CONFIG_VERSATILE_FPGA_IRQ)      += irq-versatile-fpga.o

pgpK1JS1eHXLc.pgp
Description: PGP signature