Merge "arch: arm: select ARM_GIC even for targets with gic-v3"

This commit is contained in:
Linux Build Service Account 2016-07-16 07:34:12 -07:00 committed by Gerrit - the friendly Code Review server
commit 7d225628d1
2 changed files with 1 additions and 3 deletions

View file

@ -641,6 +641,7 @@ config ARCH_QCOM
select CLKDEV_LOOKUP select CLKDEV_LOOKUP
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
select GENERIC_ALLOCATOR select GENERIC_ALLOCATOR
select ARM_GIC
select ARM_PATCH_PHYS_VIRT select ARM_PATCH_PHYS_VIRT
select ARM_HAS_SG_CHAIN select ARM_HAS_SG_CHAIN
select ARCH_HAS_OPP select ARCH_HAS_OPP

View file

@ -38,7 +38,6 @@ config ARCH_MSMFALCON
config ARCH_MSM8X60 config ARCH_MSM8X60
bool "Enable support for MSM8X60" bool "Enable support for MSM8X60"
select ARCH_SUPPORTS_BIG_ENDIAN select ARCH_SUPPORTS_BIG_ENDIAN
select ARM_GIC
select ARM_AMBA select ARM_AMBA
select QCOM_SCM if SMP select QCOM_SCM if SMP
select CLKSRC_QCOM select CLKSRC_QCOM
@ -49,7 +48,6 @@ config ARCH_MSM8960
bool "Enable support for MSM8960" bool "Enable support for MSM8960"
select CLKSRC_QCOM select CLKSRC_QCOM
select ARCH_SUPPORTS_BIG_ENDIAN select ARCH_SUPPORTS_BIG_ENDIAN
select ARM_GIC
select ARM_AMBA select ARM_AMBA
select QCOM_SCM if SMP select QCOM_SCM if SMP
select CLKSRC_OF select CLKSRC_OF
@ -59,7 +57,6 @@ config ARCH_MSM8974
bool "Enable support for MSM8974" bool "Enable support for MSM8974"
select HAVE_ARM_ARCH_TIMER select HAVE_ARM_ARCH_TIMER
select ARCH_SUPPORTS_BIG_ENDIAN select ARCH_SUPPORTS_BIG_ENDIAN
select ARM_GIC
select ARM_AMBA select ARM_AMBA
select QCOM_SCM if SMP select QCOM_SCM if SMP
select CLKSRC_OF select CLKSRC_OF