diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2014-07-25 13:03:22 +0100 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2014-07-25 13:03:22 +0100 |
| commit | ecb3c2bbf233d0c8d6e48009afa52c45c0204857 (patch) | |
| tree | 40749c2a0d71e6ad89a9664eec01842543e3ba53 /arch/arm64/Kconfig | |
| parent | 05ac65305437e8ef63d2d19cac704138a2a05aa5 (diff) | |
| parent | 021f653791ad17e03f98aaa7fb933816ae16f161 (diff) | |
Merge tag 'deps-irqchip-gic-3.17' of git://git.infradead.org/users/jcooper/linux
* tag 'deps-irqchip-gic-3.17' of git://git.infradead.org/users/jcooper/linux:
irqchip: gic-v3: Initial support for GICv3
irqchip: gic: Move some bits of GICv2 to a library-type file
Conflicts:
arch/arm64/Kconfig
Diffstat (limited to 'arch/arm64/Kconfig')
| -rw-r--r-- | arch/arm64/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index f4615ba88a77..bfd60fa9d6d5 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -10,6 +10,7 @@ config ARM64 select ARM_ARCH_TIMER select ARM_GIC select AUDIT_ARCH_COMPAT_GENERIC + select ARM_GIC_V3 select BUILDTIME_EXTABLE_SORT select CLONE_BACKWARDS select COMMON_CLK |