From: Jason Cooper <jason@lakedaemon.net>
Date: Thu, 2 Oct 2014 13:04:45 +0000 (+0000)
Subject: Merge branch 'irqchip/broadcom' into irqchip/core
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=f7472655fbe70f422c08f78d107ca24a791d7b14;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'irqchip/broadcom' into irqchip/core

Conflicts:
	drivers/irqchip/Makefile
---

f7472655fbe70f422c08f78d107ca24a791d7b14
diff --cc drivers/irqchip/Makefile
index fc2e4f77d3db,824f5eb780b6..bec790678016
--- a/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@@ -34,5 -33,5 +34,6 @@@ obj-$(CONFIG_TB10X_IRQC)		+= irq-tb10x.
  obj-$(CONFIG_XTENSA)			+= irq-xtensa-pic.o
  obj-$(CONFIG_XTENSA_MX)			+= irq-xtensa-mx.o
  obj-$(CONFIG_IRQ_CROSSBAR)		+= irq-crossbar.o
- obj-$(CONFIG_BRCMSTB_L2_IRQ)		+= irq-brcmstb-l2.o
+ obj-$(CONFIG_BRCMSTB_L2_IRQ)		+= irq-brcmstb-l2.o \
+ 					   irq-bcm7120-l2.o
 +obj-$(CONFIG_KEYSTONE_IRQ)		+= irq-keystone.o