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

Merge "msm: pm: move PM driver to a machine independent location"

parents 48c736ce 5d2b750b

arch/arm/mach-msm/Kconfig

+0 −4

Original line number	Diff line number	Diff line
		@@ -948,10 +948,6 @@ config MSM_GPIOMUX
		config MSM_NATIVE_RESTART
		bool

		config MSM_PM
		depends on PM
		bool

		config MSM_EVENT_TIMER
		bool "Event timer"
		help

arch/arm/mach-msm/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -66,7 +66,7 @@ obj-$(CONFIG_ARCH_MSM8610) += clock-8610.o
		obj-$(CONFIG_ARCH_MSM8610) += clock-dsi-8610.o
		obj-$(CONFIG_ARCH_MDM9630) += clock-9630.o

		obj-$(CONFIG_MSM_PM) += msm-pm.o pm-data.o lpm_levels.o
		obj-$(CONFIG_MSM_PM) += lpm_levels.o

		CFLAGS_msm_vibrator.o += -Idrivers/staging/android

drivers/power/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -510,3 +510,4 @@ source "drivers/power/reset/Kconfig"
		endif # POWER_SUPPLY

		source "drivers/power/avs/Kconfig"
		source "drivers/power/qcom/Kconfig"

drivers/power/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -66,3 +66,4 @@ obj-$(CONFIG_CHARGER_SMB347) += smb347-charger.o
		obj-$(CONFIG_CHARGER_TPS65090) += tps65090-charger.o
		obj-$(CONFIG_BATTERY_BCL) += battery_current_limit.o
		obj-$(CONFIG_POWER_RESET) += reset/
		obj-y += qcom/

drivers/power/qcom/Kconfig

0 → 100644

+3 −0

Original line number	Diff line number	Diff line
		config MSM_PM
		depends on PM
		bool