From acbc613601ba93f26adb3ba1d91aabeff718298b Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Wed, 17 May 2006 15:43:51 -0300 Subject: Fix compilation for Miropcm20 and Cinergy From: Mauro Carvalho Chehab Miropcm compilation were assuming to compile under linux/drivers/media/video, but this is not true when compiling in-tree. Also, make allyesconfig were making "y" to an advanced configuration for Cinergy. gentree.pl also updated. Signed-off-by: Mauro Carvalho Chehab --- v4l/scripts/gentree.pl | 24 ++++++++++++++++++++++++ v4l/scripts/make_kconfig.pl | 3 ++- 2 files changed, 26 insertions(+), 1 deletion(-) (limited to 'v4l') diff --git a/v4l/scripts/gentree.pl b/v4l/scripts/gentree.pl index de91722a7..e58d410c2 100755 --- a/v4l/scripts/gentree.pl +++ b/v4l/scripts/gentree.pl @@ -79,6 +79,14 @@ sub filter_source ($$) { $level++; next; } + if ($line =~ /^#ifdef _COMPAT_H/) { + chomp($line); + $state{$level} = "if"; + $if{$level} = 0; + print STDERR "/* BP #if MM_KERNEL state=$state{$level} if=$if{$level} level=$level ($line) */\n" if $DEBUG; + $level++; + next; + } if ($line =~ m|^\s*\#if\s+0\s*\/[\*]\s*[Kk][Ee].[Pp]\s*[\*]\/(.*)|) { if ($1 eq ";") { print OUT "#if 0\n"; @@ -164,6 +172,14 @@ sub filter_source ($$) { $level++; next; } + if ($line =~ /^#ifndef.\s*I2C_DF_DUMMY/) { + chomp($line); + $state{$level} = "if"; + $if{$level} = 1; + print STDERR "/* BP #if 1 state=$state{$level} if=$if{$level} level=$level ($line) */\n" if $DEBUG; + $level++; + next; + } if ($line =~ /^#ifndef.\s*I2C_PEC/) { chomp($line); $state{$level} = "if"; @@ -172,6 +188,14 @@ sub filter_source ($$) { $level++; next; } + if ($line =~ /^#ifdef.\s*I2C_PEC/) { + chomp($line); + $state{$level} = "if"; + $if{$level} = 1; + print STDERR "/* BP #if 1 state=$state{$level} if=$if{$level} level=$level ($line) */\n" if $DEBUG; + $level++; + next; + } if ($line =~ /^#if.*I2C_CLASS_TV_DIGITAL/) { chomp($line); $state{$level} = "if"; diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl index aebf2a950..c4212d427 100755 --- a/v4l/scripts/make_kconfig.pl +++ b/v4l/scripts/make_kconfig.pl @@ -178,7 +178,8 @@ if (($force_kconfig eq 1) || !open IN,".config") { } while ( my ($key,$value) = each(%tristate) ) { - if ($key eq "DVB_AV7110_FIRMWARE") { + if ( ($key eq "DVB_AV7110_FIRMWARE") || + ($key eq "DVB_CINERGYT2_TUNING") ) { printf OUT "CONFIG_%s=n\n",$key; } else { if ($value eq "tristate") { -- cgit v1.2.3 From 476643d84ea8e669f1e1709af2040f2a25f75dd4 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Wed, 17 May 2006 15:58:05 -0300 Subject: Added Logitech Quickcam USB support to versions.txt From: Mauro Carvalho Chehab Signed-off-by: Mauro Carvalho Chehab --- v4l/versions.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'v4l') diff --git a/v4l/versions.txt b/v4l/versions.txt index b642f60da..1e71513fa 100644 --- a/v4l/versions.txt +++ b/v4l/versions.txt @@ -15,6 +15,7 @@ VIDEO_USBVIDEO USB_VICAM USB_IBMCAM USB_KONICAWC +USB_QUICKCAM_MESSENGER USB_ET61X251 USB_PWC USB_PWC_DEBUG -- cgit v1.2.3 From 122bd90fa6f72e1366146662e7fb9a6581aab68e Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Wed, 17 May 2006 17:58:50 -0300 Subject: Removed a broken code inside make_kconfig From: Mauro Carvalho Chehab This code were not working, and were obsoleted by the while just bellow, that checks only for tristate and boolean parameters. Signed-off-by: Mauro Carvalho Chehab --- v4l/scripts/make_kconfig.pl | 4 ---- 1 file changed, 4 deletions(-) (limited to 'v4l') diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl index c4212d427..04430ccf2 100755 --- a/v4l/scripts/make_kconfig.pl +++ b/v4l/scripts/make_kconfig.pl @@ -172,10 +172,6 @@ close OUT; if (($force_kconfig eq 1) || !open IN,".config") { open OUT,">.config"; - while ( my ($key, $value) = each(%depend) ) { - printf "CONFIG_%s=m\n",$key; - printf OUT "CONFIG_%s=m\n",$key; - } while ( my ($key,$value) = each(%tristate) ) { if ( ($key eq "DVB_AV7110_FIRMWARE") || -- cgit v1.2.3