Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9b01850 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 62c7e230 ad58f2b4

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -557,6 +557,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

arch/arm/mach-qcom/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ menu "QCOM SoC Type" 
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
@@ -15,7 +14,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
@@ -26,7 +24,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
@@ -36,7 +33,6 @@ config ARCH_MDM9615 
	bool "Enable support for MDM9615"

	select CLKSRC_QCOM

	select ARCH_SUPPORTS_BIG_ENDIAN

	select ARM_GIC

	select ARM_AMBA

	select QCOM_SCM if SMP

	select CLKSRC_OF