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 2c7d9a9c authored Feb 17, 2014 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Feb 17, 2014

Merge "msm: nohlt: move nohlt driver to new kernel location"

parents f8fa97f8 c25a13bd

arch/arm/mach-msm/Makefile

+0 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,6 @@ ifndef CONFIG_ARM_ARCH_TIMER
		obj-y += timer.o
		endif
		obj-$(CONFIG_USE_OF) += board-dt.o
		obj-$(CONFIG_DEBUG_FS) += nohlt.o

		obj-y += acpuclock.o
		obj-$(CONFIG_ARCH_MSM_KRAIT) += clock-krait.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_DEBUG_FS) += nohlt.o
		obj-$(CONFIG_ARM64) += idle-v8.o
		obj-$(CONFIG_CPU_V7) += idle-v7.o
		obj-$(CONFIG_MAXIMUM_CURRENT_THROTTLING) += mct.o

arch/arm/mach-msm/nohlt.c→drivers/soc/qcom/nohlt.c

+0 −0

File moved.