From: Catalin Marinas <catalin.marinas@arm.com>
Date: Fri, 25 Jul 2014 12:03:22 +0000 (+0100)
Subject: Merge tag 'deps-irqchip-gic-3.17' of git://git.infradead.org/users/jcooper/linux
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ecb3c2bbf233d0c8d6e48009afa52c45c0204857;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

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
---

ecb3c2bbf233d0c8d6e48009afa52c45c0204857
diff --cc arch/arm64/Kconfig
index f4615ba88a77,be52492c2291..bfd60fa9d6d5
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -9,7 -9,7 +9,8 @@@ config ARM6
  	select ARM_AMBA
  	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