Merge branch 'irqchip/tango' into irqchip/core

diff --combined drivers/irqchip/Kconfig
index 72e5a842cdae0a82b4a820dde6eb0b59904b87a3,6bdfbce0388f88029ec2c8c46ec17672142ab08b..a326dc55655dd714632ba06def7f749d0b3d4563
--- 1/drivers/irqchip/Kconfig
--- 2/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@@ -60,11 -60,6 +60,11 @@@ config ARM_VIC_N
          The maximum number of VICs available in the system, for
          power management.
  
 +config ARMADA_370_XP_IRQ
 +      bool
 +      select GENERIC_IRQ_CHIP
 +      select PCI_MSI_IRQ_DOMAIN if PCI_MSI
 +
  config ATMEL_AIC_IRQ
        bool
        select GENERIC_IRQ_CHIP
@@@ -156,6 -151,11 +156,11 @@@ config ST_IRQCHI
        help
          Enables SysCfg Controlled IRQs on STi based platforms.
  
+ config TANGO_IRQ
+       bool
+       select IRQ_DOMAIN
+       select GENERIC_IRQ_CHIP
+ 
  config TB10X_IRQC
        bool
        select IRQ_DOMAIN
@@@ -164,8 -164,6 +169,8 @@@
  config TS4800_IRQ
        tristate "TS-4800 IRQ controller"
        select IRQ_DOMAIN
 +      depends on HAS_IOMEM
 +      depends on SOC_IMX51 || COMPILE_TEST
        help
          Support for the TS-4800 FPGA IRQ controller
  

diff --combined drivers/irqchip/Makefile
index 30dba044d0b8cfad951dc56a915d1fc3f5692547,ec83deb0c719532a1c7959b589862fc17237f5b4..be6ada6eaab36657966940b161e36a3818d8835b
--- 1/drivers/irqchip/Makefile
--- 2/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@@ -5,6 -5,7 +5,6 @@@ obj-$(CONFIG_ARCH_BCM2835)               += irq-bcm2
  obj-$(CONFIG_ARCH_EXYNOS)             += exynos-combiner.o
  obj-$(CONFIG_ARCH_HIP04)              += irq-hip04.o
  obj-$(CONFIG_ARCH_MMP)                        += irq-mmp.o
 -obj-$(CONFIG_ARCH_MVEBU)              += irq-armada-370-xp.o
  obj-$(CONFIG_IRQ_MXS)                 += irq-mxs.o
  obj-$(CONFIG_ARCH_TEGRA)              += irq-tegra.o
  obj-$(CONFIG_ARCH_S3C24XX)            += irq-s3c24xx.o
@@@ -27,7 -28,6 +27,7 @@@ obj-$(CONFIG_ARM_GIC_V3_ITS)          += irq-gi
  obj-$(CONFIG_HISILICON_IRQ_MBIGEN)    += irq-mbigen.o
  obj-$(CONFIG_ARM_NVIC)                        += irq-nvic.o
  obj-$(CONFIG_ARM_VIC)                 += irq-vic.o
 +obj-$(CONFIG_ARMADA_370_XP_IRQ)               += irq-armada-370-xp.o
  obj-$(CONFIG_ATMEL_AIC_IRQ)           += irq-atmel-aic-common.o irq-atmel-aic.o
  obj-$(CONFIG_ATMEL_AIC5_IRQ)  += irq-atmel-aic-common.o irq-atmel-aic5.o
  obj-$(CONFIG_I8259)                   += irq-i8259.o
@@@ -40,6 -40,7 +40,7 @@@ obj-$(CONFIG_VERSATILE_FPGA_IRQ)      += irq
  obj-$(CONFIG_ARCH_NSPIRE)             += irq-zevio.o
  obj-$(CONFIG_ARCH_VT8500)             += irq-vt8500.o
  obj-$(CONFIG_ST_IRQCHIP)              += irq-st.o
+ obj-$(CONFIG_TANGO_IRQ)                       += irq-tango.o
  obj-$(CONFIG_TB10X_IRQC)              += irq-tb10x.o
  obj-$(CONFIG_TS4800_IRQ)              += irq-ts4800.o
  obj-$(CONFIG_XTENSA)                  += irq-xtensa-pic.o