diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-12 23:49:57 -0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-12 23:49:57 -0200 |
commit | ba7457fc4d28e1b336aaa55c60d3814c310f9fd8 (patch) | |
tree | c6e2921c1aa0c11a0f743c01e3fcd42124410138 /v4l/scripts | |
parent | 667e11f6005391136bad274d2333240d54b08294 (diff) | |
parent | 10b29761e7203ebceee27adfb5d3e92803f2512e (diff) | |
download | mediapointer-dvb-s2-ba7457fc4d28e1b336aaa55c60d3814c310f9fd8.tar.gz mediapointer-dvb-s2-ba7457fc4d28e1b336aaa55c60d3814c310f9fd8.tar.bz2 |
merge: http://linuxtv.org/hg/~anttip/af9015/
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'v4l/scripts')
-rwxr-xr-x | v4l/scripts/hghead.pl | 2 | ||||
-rwxr-xr-x | v4l/scripts/make_kconfig.pl | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/v4l/scripts/hghead.pl b/v4l/scripts/hghead.pl index dc989dd61..abca09c45 100755 --- a/v4l/scripts/hghead.pl +++ b/v4l/scripts/hghead.pl @@ -134,7 +134,7 @@ while ($line = <IN>) { next; } - if ($tag =~ m/^(acked-by|thanks-to|reviewed-by|noticed-by|cc):/) { + if ($tag =~ m/^(acked-by|thanks-to|reviewed-by|noticed-by|tested-by|cc):/) { $signed="$signed$line"; next; } diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl index 20b94f0c1..7c259eeb6 100755 --- a/v4l/scripts/make_kconfig.pl +++ b/v4l/scripts/make_kconfig.pl @@ -582,6 +582,7 @@ disable_config('DVB_AV7110_FIRMWARE'); disable_config('DVB_CINERGYT2_TUNING'); disable_config('DVB_FE_CUSTOMISE'); disable_config('VIDEO_HELPER_CHIPS_AUTO'); +disable_config('VIDEO_FIXED_MINOR_RANGES'); # Check dependencies my %newconfig = checkdeps(); |