diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-04 17:16:51 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-04 17:16:51 +1000 |
| commit | 52851256cec4106a487b16b830f4d5bf98262344 (patch) | |
| tree | b9b48fa5da4ae9e433f86246ace09d38184c7a4e /arch | |
| parent | 9d504e3e3c1d96bb4c8aa4ac510bd55f43b72bd1 (diff) | |
| parent | c115d15552c011fdf3caf15792ce0c62e8837470 (diff) | |
Merge remote-tracking branch 'irqchip/irqchip/for-next'
Conflicts:
Documentation/devicetree/bindings/arm/gic.txt
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 b0f9c9db9590..a5dc5ff145a3 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 |