projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a778bf3 fda9203)
Merge branch 'irqchip/broadcom' into irqchip/core
authorJason Cooper <jason@lakedaemon.net>
Thu, 2 Oct 2014 13:04:45 +0000 (13:04 +0000)
committerJason Cooper <jason@lakedaemon.net>
Thu, 2 Oct 2014 13:04:45 +0000 (13:04 +0000)
Conflicts:
drivers/irqchip/Makefile

1  2 
drivers/irqchip/Makefile patch | diff1 | diff2 | blob | history

diff --cc drivers/irqchip/Makefile
index fc2e4f77d3dbbee4cbdc2f8bd14b70ee52f7b5b7,824f5eb780b67a8f630d02cbb05fb289711af799..bec790678016eeb4578f89f40cc8c1b03ec1a298
--- 1/drivers/irqchip/Makefile
--- 2/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