diff options
| author | Ryan Harkin <ryan.harkin@linaro.org> | 2017-07-21 12:52:31 +0100 |
|---|---|---|
| committer | Ryan Harkin <ryan.harkin@linaro.org> | 2017-07-21 12:52:31 +0100 |
| commit | 87f363cf7fd8ab70e5c197dc4f6530c068d4d99c (patch) | |
| tree | f616f19f79653c66e90f0846cc4e4740aab51ed6 /arch/arm/mach-vexpress/Kconfig | |
| parent | b72bb948da638014d47176756b59ead8dee236ee (diff) | |
| parent | 557c87a2ff8bc387360056979070de9adf419745 (diff) | |
Merge branch 'latest-armlt-fvp' into latest-armlt
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
# Conflicts:
# arch/arm/boot/dts/Makefile
Diffstat (limited to 'arch/arm/mach-vexpress/Kconfig')
| -rw-r--r-- | arch/arm/mach-vexpress/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig index 0f07ae362e77..834084feccbb 100644 --- a/arch/arm/mach-vexpress/Kconfig +++ b/arch/arm/mach-vexpress/Kconfig @@ -4,6 +4,7 @@ menuconfig ARCH_VEXPRESS select ARCH_SUPPORTS_BIG_ENDIAN select ARM_AMBA select ARM_GIC + select ARM_GIC_V3 select ARM_GLOBAL_TIMER select ARM_TIMER_SP804 select COMMON_CLK_VERSATILE |