diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-07-16 07:34:12 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-07-16 07:34:12 -0700 |
| commit | 7d225628d1e4ab7048cb44c19f735f11e23d9a0d (patch) | |
| tree | 804d97e4d20e8df0ed05ffccc446dbe7e4d1e22e | |
| parent | d0a8f8d77466650847920d631c84490632e709e1 (diff) | |
| parent | 498823ccd90f5956b65f4587e276ac34fdf09010 (diff) | |
Merge "arch: arm: select ARM_GIC even for targets with gic-v3"
| -rw-r--r-- | arch/arm/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-qcom/Kconfig | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 863f2cd9096a..83082a5790d8 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -641,6 +641,7 @@ config ARCH_QCOM select CLKDEV_LOOKUP select GENERIC_CLOCKEVENTS select GENERIC_ALLOCATOR + select ARM_GIC select ARM_PATCH_PHYS_VIRT select ARM_HAS_SG_CHAIN select ARCH_HAS_OPP diff --git a/arch/arm/mach-qcom/Kconfig b/arch/arm/mach-qcom/Kconfig index c4e90e02bb83..69261c70e1dd 100644 --- a/arch/arm/mach-qcom/Kconfig +++ b/arch/arm/mach-qcom/Kconfig @@ -38,7 +38,6 @@ config ARCH_MSMFALCON config ARCH_MSM8X60 bool "Enable support for MSM8X60" select ARCH_SUPPORTS_BIG_ENDIAN - select ARM_GIC select ARM_AMBA select QCOM_SCM if SMP select CLKSRC_QCOM @@ -49,7 +48,6 @@ config ARCH_MSM8960 bool "Enable support for MSM8960" select CLKSRC_QCOM select ARCH_SUPPORTS_BIG_ENDIAN - select ARM_GIC select ARM_AMBA select QCOM_SCM if SMP select CLKSRC_OF @@ -59,7 +57,6 @@ config ARCH_MSM8974 bool "Enable support for MSM8974" select HAVE_ARM_ARCH_TIMER select ARCH_SUPPORTS_BIG_ENDIAN - select ARM_GIC select ARM_AMBA select QCOM_SCM if SMP select CLKSRC_OF |