diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-13 11:53:31 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-13 11:53:31 -0300 |
commit | 4c691e7dabc47811013c7266fa5f32fe96687c36 (patch) | |
tree | a6185d7724be9b53607ab988625fd75052b1a9b2 /v4l/scripts | |
parent | 8201f56625ffdc9146ad8eb4525c1b50e6194f5a (diff) | |
parent | 4198bf24c30e208e3c1a4d833e52ee2330bdb008 (diff) | |
download | mediapointer-dvb-s2-4c691e7dabc47811013c7266fa5f32fe96687c36.tar.gz mediapointer-dvb-s2-4c691e7dabc47811013c7266fa5f32fe96687c36.tar.bz2 |
merge: http://kernellabs.com/hg/~dheitmueller/em28xx-vbi3
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'v4l/scripts')
-rwxr-xr-x | v4l/scripts/make_kconfig.pl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl index cfe53a636..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 @@ -592,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'); +$intopt { "DVB_MAX_ADAPTERS" } = 8; # Check dependencies my %newconfig = checkdeps(); |