summaryrefslogtreecommitdiff
path: root/v4l/scripts/make_kconfig.pl
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-09-15 14:09:03 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-15 14:09:03 -0300
commit5c742b688922417548eae7f84f8979c6e08d9692 (patch)
tree061ccba74878c6885fe91563ae9e616b88e4a7ee /v4l/scripts/make_kconfig.pl
parenta7ec580399a117b5f3320f4e0b252d0ba87917ba (diff)
parent6c7152d8e7cab73ccc06346104d485dd0c03aa19 (diff)
downloadmediapointer-dvb-s2-5c742b688922417548eae7f84f8979c6e08d9692.tar.gz
mediapointer-dvb-s2-5c742b688922417548eae7f84f8979c6e08d9692.tar.bz2
merge: http://linuxtv.org/hg/~awalls/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'v4l/scripts/make_kconfig.pl')
-rwxr-xr-xv4l/scripts/make_kconfig.pl3
1 files changed, 3 insertions, 0 deletions
diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl
index 4690f6ab4..8e0504b61 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
@@ -592,6 +593,8 @@ 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;
# Check dependencies