diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-28 16:05:31 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-28 16:05:31 +1000 |
| commit | 82736b097cf6c576c862f651fe60dc79a000b6b6 (patch) | |
| tree | cf04411b16323007c0a07be86514d24cf8eb9c1c /arch | |
| parent | f890ba1b1d1861d17b13adc2860024f0cd3e6898 (diff) | |
| parent | c115d15552c011fdf3caf15792ce0c62e8837470 (diff) | |
Merge remote-tracking branch 'irqchip/irqchip/for-next'
Conflicts:
arch/arm64/Kconfig
drivers/irqchip/irq-gic.c
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 3e3aeac3881a..555ad3cf3f0f 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -10,8 +10,9 @@ config ARM64 select ARM_AMBA select ARM_ARCH_TIMER select ARM_GIC - select AUDIT_ARCH_COMPAT_GENERIC + select ARM_GIC_V2M if (PCI && PCI_MSI) select ARM_GIC_V3 + select AUDIT_ARCH_COMPAT_GENERIC select BUILDTIME_EXTABLE_SORT select CLONE_BACKWARDS select COMMON_CLK |