diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-06 07:41:31 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-06 07:41:31 -0800 |
| commit | f60be0d5c1f2dd0188205f04a4a7b8778234fd9c (patch) | |
| tree | 517a2b01eec7703d049bc712030a62f6681ec636 /arch/arm/Kconfig | |
| parent | 3b19119b95a52200c8ae3df3aa89c21c9a1a8894 (diff) | |
| parent | 2389d5014342e9535aad212d0c68d439aaf534ba (diff) | |
| download | talos-obmc-linux-f60be0d5c1f2dd0188205f04a4a7b8778234fd9c.tar.gz talos-obmc-linux-f60be0d5c1f2dd0188205f04a4a7b8778234fd9c.zip | |
Merge tag 'integrator-irq' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/soc
From Linus Walleij:
This provides the following Integrator refactorings:
- Switch the FPGA IRQ controller to use the simple IRQ domain
- Get rid of preallocated IRQ descriptors on the Integrator
- Move the FPGA IRQ driver to drivers/irqchip
* tag 'integrator-irq' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
ARM: plat-versatile: move FPGA irq driver to drivers/irqchip
ARM: integrator: get rid of preallocated irq descriptors
ARM: plat-versatile: use simple irqdomain for FPGA IRQ
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b9c7f8817feb..5de7602debcd 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -284,8 +284,8 @@ config ARCH_INTEGRATOR select MULTI_IRQ_HANDLER select NEED_MACH_MEMORY_H select PLAT_VERSATILE - select PLAT_VERSATILE_FPGA_IRQ select SPARSE_IRQ + select VERSATILE_FPGA_IRQ help Support for ARM's Integrator platform. @@ -318,7 +318,7 @@ config ARCH_VERSATILE select PLAT_VERSATILE select PLAT_VERSATILE_CLCD select PLAT_VERSATILE_CLOCK - select PLAT_VERSATILE_FPGA_IRQ + select VERSATILE_FPGA_IRQ help This enables support for ARM Ltd Versatile board. |
