From a8f908ae4e4df8c18b0fe87bfae722392b5429d8 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Thu, 10 Sep 2009 19:58:39 +0200 Subject: v4l: Merge drivers/staging/go7007 in v4l-dvb. From: Hans Verkuil Having go7007 as part of v4l-dvb makes it easier to continue developing this driver. Priority: normal Signed-off-by: Hans Verkuil --- v4l/scripts/make_kconfig.pl | 1 + 1 file changed, 1 insertion(+) (limited to 'v4l/scripts/make_kconfig.pl') diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl index 4690f6ab4..fd6dbd739 100755 --- a/v4l/scripts/make_kconfig.pl +++ b/v4l/scripts/make_kconfig.pl @@ -585,6 +585,7 @@ EOF open_kconfig('../linux', '../linux/drivers/media/Kconfig'); open_kconfig('.', './Kconfig.sound'); +open_kconfig('.', './Kconfig.staging'); close OUT; # These options should default to off -- cgit v1.2.3 From fe1b63559744f62262a57748763586b4a97bed3b Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 14 Sep 2009 09:42:41 -0300 Subject: Add tm6000 and tuner-xc2028 drivers From: Mauro Carvalho Chehab Adds a V4L driver for Trident TV Master TM5600/TM6000 chips. Those USB devices are usually found with a Xceive XC2028/XC3028 tuner, although the firmware seems to be modified to work with those chips. Priority: normal Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Mauro Carvalho Chehab --- v4l/scripts/make_kconfig.pl | 1 + 1 file changed, 1 insertion(+) (limited to 'v4l/scripts/make_kconfig.pl') diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl index fd6dbd739..764072101 100755 --- a/v4l/scripts/make_kconfig.pl +++ b/v4l/scripts/make_kconfig.pl @@ -593,6 +593,7 @@ disable_config('DVB_AV7110_FIRMWARE'); disable_config('DVB_CINERGYT2_TUNING'); disable_config('VIDEO_HELPER_CHIPS_AUTO'); disable_config('VIDEO_FIXED_MINOR_RANGES'); +disable_config('STAGING_BROKEN'); $intopt { "DVB_MAX_ADAPTERS" } = 8; # Check dependencies -- cgit v1.2.3 From 8cdbcfff94841040078b0f53189040cd4861eb2f Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 14 Sep 2009 13:06:46 -0300 Subject: Build system: disable staging files by default From: Mauro Carvalho Chehab Priority: normal Signed-off-by: Mauro Carvalho Chehab --- v4l/scripts/make_kconfig.pl | 1 + 1 file changed, 1 insertion(+) (limited to 'v4l/scripts/make_kconfig.pl') diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl index 764072101..8e0504b61 100755 --- a/v4l/scripts/make_kconfig.pl +++ b/v4l/scripts/make_kconfig.pl @@ -593,6 +593,7 @@ disable_config('DVB_AV7110_FIRMWARE'); disable_config('DVB_CINERGYT2_TUNING'); disable_config('VIDEO_HELPER_CHIPS_AUTO'); disable_config('VIDEO_FIXED_MINOR_RANGES'); +disable_config('STAGING'); disable_config('STAGING_BROKEN'); $intopt { "DVB_MAX_ADAPTERS" } = 8; -- cgit v1.2.3