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

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

Merge "misc: Fix merge error in Makefile" into msm-4.9

parents e0142def 8273f75b

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