From ff7dd422140de27cedcb0ce7b2af76740ef3cd11 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Wed, 30 Apr 2008 00:02:45 -0300 Subject: backport tuners move patch from -git From: Mauro Carvalho Chehab Due to the feedback I got, I've changed the -git patch. This needs to be reflected also at -hg tree. kernel-sync: Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'linux/drivers/media/Makefile') diff --git a/linux/drivers/media/Makefile b/linux/drivers/media/Makefile index b6c5b35cc..73f742c7e 100644 --- a/linux/drivers/media/Makefile +++ b/linux/drivers/media/Makefile @@ -2,6 +2,10 @@ # Makefile for the kernel multimedia device drivers. # -obj-y := common/ -obj-$(CONFIG_VIDEO_DEV) += radio/ video/ +obj-$(CONFIG_VIDEO_MEDIA) += common/ + +# Since hybrid devices are here, should be compiled if DVB and/or V4L +obj-$(CONFIG_VIDEO_MEDIA) += video/ + +obj-$(CONFIG_VIDEO_DEV) += radio/ obj-$(CONFIG_DVB_CORE) += dvb/ -- cgit v1.2.3