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

Commit 1f422ea6 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "media: dvb: Fix compilation after moving to kernel3.10"

parents 80625246 1c2a9151

drivers/media/platform/msm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


obj-$(CONFIG_MSM_VIDC_V4L2)     += vidc/

obj-$(CONFIG_MSM_WFD) += wfd/

obj-$(CONFIG_MSM_DVB) += dvb/

obj-$(CONFIG_DVB_MPQ) += dvb/

obj-$(CONFIG_MSM_CAMERA) += camera_v1/

obj-$(CONFIG_MSMB_CAMERA) += camera_v2/

obj-y += vcap/

drivers/media/platform/msm/dvb/adapter/Makefile

+2 −2
Original line number Diff line number Diff line 


EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/

EXTRA_CFLAGS += -Idrivers/media/platform/msm/dvb/include/

ccflags-y += -Idrivers/media/dvb-core/

ccflags-y += -Idrivers/media/platform/msm/dvb/include/



obj-$(CONFIG_DVB_MPQ) += mpq-adapter.o

drivers/media/platform/msm/dvb/demux/Makefile

+1 −1
Original line number Diff line number Diff line 


ccflags-y += -Idrivers/media/dvb/dvb-core/

ccflags-y += -Idrivers/media/dvb-core/

ccflags-y += -Idrivers/media/platform/msm/dvb/include/

ccflags-y += -Idrivers/misc/