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

This project is archived. Its data is read-only.

Commit 097b611a authored Feb 17, 2014 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Feb 17, 2014

Merge "msm: idle-v7: move idle-v7 driver to a new location"

parents f52bf41b 3b8d6de0

arch/arm/mach-msm/Makefile

+0 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@ obj-$(CONFIG_SMP) += headsmp.o platsmp.o
		obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o

		obj-$(CONFIG_MSM_AVS_HW) += avs.o
		obj-$(CONFIG_CPU_V7) += idle-v7.o

		obj-$(CONFIG_MSM_SCM) += scm-boot.o
		obj-$(CONFIG_MSM_XPU_ERR_FATAL) += scm-xpu.o

drivers/soc/qcom/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@ CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1)

		obj-y += qdsp6v2/

		obj-$(CONFIG_CPU_V7) += idle-v7.o
		obj-$(CONFIG_MAXIMUM_CURRENT_THROTTLING) += mct.o
		obj-$(CONFIG_MSM_BAM_DMUX) += bam_dmux.o
		obj-$(CONFIG_MSM_IPC_ROUTER_HSIC_XPRT) += ipc_router_hsic_xprt.o

arch/arm/mach-msm/idle-v7.S→drivers/soc/qcom/idle-v7.S

+0 −0

File moved.