diff options
| author | Olof Johansson <olof@lixom.net> | 2014-03-09 08:32:26 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-03-09 08:32:26 +0100 |
| commit | 63261d76c81ff89638d15a181d5ef5adb03c0e30 (patch) | |
| tree | 07461c0864dcf3f2e1b8f5a376af6bd23a42a647 /drivers/irqchip/Makefile | |
| parent | Merge tag 'mvebu-watchdog-3.15-2' of git://git.infradead.org/linux-mvebu into... (diff) | |
| parent | Merge branch 'crossbar_3.14_rc1' of git://github.com/Sricharanti/sricharan in... (diff) | |
| download | linux-63261d76c81ff89638d15a181d5ef5adb03c0e30.tar.xz linux-63261d76c81ff89638d15a181d5ef5adb03c0e30.zip | |
Merge tag 'omap-for-v3.15/crossbar-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/drivers
Merge OMAP crossbar support from Tony Lindgren:
Add support for GIC crossbar that routes interrupts on newer omaps.
Looks like people wanted these merged via the omap tree as it's
the only user for the GIC crossbar.
* tag 'omap-for-v3.15/crossbar-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: DRA: Enable Crossbar IP support for DRA7XX
ARM: OMAP4+: Correct Wakeup-gen code to use physical irq number
DRIVERS: IRQCHIP: CROSSBAR: Add support for Crossbar IP
DRIVERS: IRQCHIP: IRQ-GIC: Add support for routable irqs
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/irqchip/Makefile')
| -rw-r--r-- | drivers/irqchip/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index 5194afb39e78..cb37e5777f18 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -26,3 +26,4 @@ obj-$(CONFIG_ARCH_VT8500) += irq-vt8500.o obj-$(CONFIG_TB10X_IRQC) += irq-tb10x.o obj-$(CONFIG_XTENSA) += irq-xtensa-pic.o obj-$(CONFIG_XTENSA_MX) += irq-xtensa-mx.o +obj-$(CONFIG_IRQ_CROSSBAR) += irq-crossbar.o |