From aac29554759ba1097551414afc35ed9fa13056c2 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sat, 26 Apr 2008 13:13:56 -0300 Subject: From: Mauro Carvalho Chehab Move tuners to common/tuners There were several issues in the past, caused by the hybrid tuner design, since now, the same tuner can be used by drivers/media/dvb and drivers/media/video. This patch moves those common tuners into a common dir. It also moves saa7146 driver into drivers/media/video, where other hybrid drivers are placed. Kconfig items were rearranged, to split V4L/DVB core from their drivers. Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'linux/drivers/media/Makefile') diff --git a/linux/drivers/media/Makefile b/linux/drivers/media/Makefile index 7b8bb6949..b6c5b35cc 100644 --- a/linux/drivers/media/Makefile +++ b/linux/drivers/media/Makefile @@ -3,9 +3,5 @@ # obj-y := common/ -obj-y += video/ -obj-$(CONFIG_VIDEO_DEV) += radio/ +obj-$(CONFIG_VIDEO_DEV) += radio/ video/ obj-$(CONFIG_DVB_CORE) += dvb/ -ifeq ($(CONFIG_DVB_CORE),) - obj-$(CONFIG_VIDEO_TUNER) += dvb/frontends/ -endif -- cgit v1.2.3 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 From 7ac2a0cdca5bb0c9c31c2691c298becb8d777077 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 26 May 2008 11:21:45 -0300 Subject: Backport some miscelaneous trivial fixes from mainstream From: Mauro Carvalho Chehab 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 --- 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 Date: Mon, 26 May 2008 11:23:49 -0300 Subject: always enter drivers/media/video/ From: Adrian Bunk 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 Acked-by: Ingo Molnar Signed-off-by: Mauro Carvalho Chehab --- 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