diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-19 21:12:24 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-19 21:13:41 -0800 |
| commit | 844e8a16f25568eefd02a6bfb40bdd9bc04704b8 (patch) | |
| tree | fdfe4de420c66517a2e4a2a25a454997c6210e95 /arch/arm/common/Kconfig | |
| parent | 5ecdd39f6cdd57aa42e072bf30aa7239fd109d7a (diff) | |
| parent | a53bfa07369b7c3448a60d29f0fc2e81751ed0b7 (diff) | |
Merge branch 'picoxcell/cleanup' into next/cleanup
* picoxcell/cleanup: (4 commits)
MAINTAINERS: add maintainer entry for Picochip picoxcell
ARM: picoxcell: move io mappings to common.c
ARM: picoxcell: don't reserve irq_descs
ARM: picoxcell: remove mach/memory.h
Conflicts:
arch/arm/mach-at91/setup.c
Diffstat (limited to 'arch/arm/common/Kconfig')
| -rw-r--r-- | arch/arm/common/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig index 74df9ca2be31..81a933eb0903 100644 --- a/arch/arm/common/Kconfig +++ b/arch/arm/common/Kconfig @@ -1,8 +1,14 @@ config ARM_GIC select IRQ_DOMAIN + select MULTI_IRQ_HANDLER + bool + +config GIC_NON_BANKED bool config ARM_VIC + select IRQ_DOMAIN + select MULTI_IRQ_HANDLER bool config ARM_VIC_NR |