From 7ac2a0cdca5bb0c9c31c2691c298becb8d777077 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab <mchehab@infradead.org> Date: Mon, 26 May 2008 11:21:45 -0300 Subject: Backport some miscelaneous trivial fixes from mainstream From: Mauro Carvalho Chehab <mchehab@infradead.org> Summary of changes: linux/drivers/media/Makefile | 2 ++ linux/drivers/media/common/tuners/mxl5005s.c | 1 - linux/drivers/media/video/cx18/cx18-driver.c | 2 +- linux/drivers/media/video/saa7134/saa7134-video.c | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org> --- linux/drivers/media/Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'linux/drivers/media/Makefile') diff --git a/linux/drivers/media/Makefile b/linux/drivers/media/Makefile index 73f742c7e..cc11c4c0e 100644 --- a/linux/drivers/media/Makefile +++ b/linux/drivers/media/Makefile @@ -2,6 +2,8 @@ # Makefile for the kernel multimedia device drivers. # +obj-y := common/ + obj-$(CONFIG_VIDEO_MEDIA) += common/ # Since hybrid devices are here, should be compiled if DVB and/or V4L -- cgit v1.2.3 From 05da578ca1e11f37b78f9821a7c26dcd603fb5bb Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab <mchehab@infradead.org> Date: Mon, 26 May 2008 11:23:49 -0300 Subject: always enter drivers/media/video/ From: Adrian Bunk <bunk@kernel.org> After commit 039d40019f3c5e26ea50ec5af4270189f63365e1 (V4L/DVB (7898): Fix VIDEO_MEDIA Kconfig logic) VIDEO_MEDIA is no longer usable in Makefile's for deciding which directories we enter, resulting in compile errors like the following with CONFIG_VIDEO_DEV=y, CONFIG_DVB_CORE=m: <-- snip --> ... MODPOST 187 modules ... make[2]: *** [__modpost] Error 1 <-- snip --> The easiest solution is to always enter video/ Signed-off-by: Adrian Bunk <bunk@kernel.org> Acked-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org> --- linux/drivers/media/Makefile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'linux/drivers/media/Makefile') diff --git a/linux/drivers/media/Makefile b/linux/drivers/media/Makefile index cc11c4c0e..09a829d8a 100644 --- a/linux/drivers/media/Makefile +++ b/linux/drivers/media/Makefile @@ -2,12 +2,7 @@ # Makefile for the kernel multimedia device drivers. # -obj-y := common/ - -obj-$(CONFIG_VIDEO_MEDIA) += common/ - -# Since hybrid devices are here, should be compiled if DVB and/or V4L -obj-$(CONFIG_VIDEO_MEDIA) += video/ +obj-y += common/ video/ obj-$(CONFIG_VIDEO_DEV) += radio/ obj-$(CONFIG_DVB_CORE) += dvb/ -- cgit v1.2.3