diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-05-06 17:43:45 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-05-06 17:43:45 -0400 |
| commit | 442a33ebce9e02a2dd6662f16c9f2aad834d0115 (patch) | |
| tree | ca8654a286f61da917318645cab9e061095ecdba /drivers/irqchip/Kconfig | |
| parent | a94d236dc355f374857ee4e6e78b7dec8a0f29e3 (diff) | |
| parent | f31c2f1c68aff83277eddc6798adf3438e9c680a (diff) | |
Merge branch 'late/clksrc' into late/cleanup
There is no reason to keep the clksrc cleanups separate from the
other cleanups, and this resolves some merge conflicts.
Conflicts:
arch/arm/mach-spear/spear13xx.c
drivers/irqchip/Makefile
Diffstat (limited to 'drivers/irqchip/Kconfig')
| -rw-r--r-- | drivers/irqchip/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig index a350969e5efe..4a33351c25dc 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig | |||
| @@ -25,6 +25,14 @@ config ARM_VIC_NR | |||
| 25 | The maximum number of VICs available in the system, for | 25 | The maximum number of VICs available in the system, for |
| 26 | power management. | 26 | power management. |
| 27 | 27 | ||
| 28 | config RENESAS_INTC_IRQPIN | ||
| 29 | bool | ||
| 30 | select IRQ_DOMAIN | ||
| 31 | |||
| 32 | config RENESAS_IRQC | ||
| 33 | bool | ||
| 34 | select IRQ_DOMAIN | ||
| 35 | |||
| 28 | config VERSATILE_FPGA_IRQ | 36 | config VERSATILE_FPGA_IRQ |
| 29 | bool | 37 | bool |
| 30 | select IRQ_DOMAIN | 38 | select IRQ_DOMAIN |