Commit 8273f75b authored Mar 17, 2017 by Jack Pham

misc: Fix merge error in Makefile



commit 735a2da5 ("ANDROID: uid_sys_stats: rename uid_cputime.c
to uid_sys_stats.c") renamed the driver file along with the Kconfig
entry, however the resulting merge resolution failed to remove the
obj-$(CONFIG_UID_CPUTIME) target in the Makefile. Remove it.

Change-Id: I0b975e0c05b916a22dd7c226f1f6c0c8fa404323
Signed-off-by: Jack Pham <jackp@codeaurora.org>

parent 2ce06168

drivers/misc/Makefile

+0 −1

Original line number	Diff line number	Diff line
		@@ -53,7 +53,6 @@ obj-$(CONFIG_ECHO) += echo/
		obj-$(CONFIG_VEXPRESS_SYSCFG) += vexpress-syscfg.o
		obj-$(CONFIG_CXL_BASE) += cxl/
		obj-$(CONFIG_PANEL) += panel.o
		obj-$(CONFIG_UID_CPUTIME) += uid_cputime.o
		obj-y += qcom/
		obj-$(CONFIG_MEMORY_STATE_TIME) += memory_state_time.o