From ca0fba3295abe13d074d1a59b3c628ed90fd31f2 Mon Sep 17 00:00:00 2001 From: Trent Piepho Date: Tue, 1 Aug 2006 16:51:34 -0700 Subject: Fix minor errors in build files From: Trent Piepho In pwc Kconfig, change 'depends' to 'depends on' In dvb-core Makefile, change '=' to ':=' Signed-off-by: Trent Piepho --- linux/drivers/media/dvb/dvb-core/Makefile | 6 +++--- linux/drivers/media/video/pwc/Kconfig | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/linux/drivers/media/dvb/dvb-core/Makefile b/linux/drivers/media/dvb/dvb-core/Makefile index 11054657f..0b5182835 100644 --- a/linux/drivers/media/dvb/dvb-core/Makefile +++ b/linux/drivers/media/dvb/dvb-core/Makefile @@ -2,8 +2,8 @@ # Makefile for the kernel DVB device drivers. # -dvb-core-objs = dvbdev.o dmxdev.o dvb_demux.o dvb_filter.o \ - dvb_ca_en50221.o dvb_frontend.o \ - dvb_net.o dvb_ringbuffer.o dvb_math.o +dvb-core-objs := dvbdev.o dmxdev.o dvb_demux.o dvb_filter.o \ + dvb_ca_en50221.o dvb_frontend.o \ + dvb_net.o dvb_ringbuffer.o dvb_math.o obj-$(CONFIG_DVB_CORE) += dvb-core.o diff --git a/linux/drivers/media/video/pwc/Kconfig b/linux/drivers/media/video/pwc/Kconfig index 697145e0b..8fdf7101d 100644 --- a/linux/drivers/media/video/pwc/Kconfig +++ b/linux/drivers/media/video/pwc/Kconfig @@ -30,7 +30,7 @@ config USB_PWC config USB_PWC_DEBUG bool "USB Philips Cameras verbose debug" - depends USB_PWC + depends on USB_PWC help Say Y here in order to have the pwc driver generate verbose debugging messages. -- cgit v1.2.3 From 384570f9e6a76f7b7368054a73de863076746689 Mon Sep 17 00:00:00 2001 From: Trent Piepho Date: Tue, 1 Aug 2006 16:58:27 -0700 Subject: Quick fix to make building work again From: Trent Piepho Instead of reading linux/config.h, read linux/autoconf.h to get the kernel's configuration. The former file has been obsoleted. In Kconfig 'select' lines, ignore the 'if' clause if one exists. This is not a permanent solution to correctly parse and evaluate Kconfig files. That is much harder, this will get building working again now. Signed-off-by: Trent Piepho --- v4l/scripts/make_kconfig.pl | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl index 771efa63d..e34a26f17 100755 --- a/v4l/scripts/make_kconfig.pl +++ b/v4l/scripts/make_kconfig.pl @@ -26,10 +26,6 @@ sub process_config ($) open $in,"$kernel/include/$filename" or die "File not found: $kernel/include/$filename"; while (<$in>) { - if (m|\#include\s+\<(.*)\>|) { - process_config ($1); - next; - } if (m/\#define\s+CONFIG_([^ ]*)_ON_SMP\s+(.*)\n/) { my $key=$1; my $value=$2; @@ -229,10 +225,10 @@ sub open_kconfig($$) { open_kconfig($dir,"$dir/$1"); next; } - if (m|^\s+depends on\s+(.*)\n|) { + if (m|^\s+depends on\s+(.+?)\s*$|) { check_deps ($key,$1); } - if (m|^\s+select\s+(.*)\n|) { + if (m|^\s+select\s+(.+?)\s*(if .*?)?\s*$|) { check_deps ($key,$1); } if (m|^\s+bool(ean)?\s|) { @@ -333,7 +329,7 @@ sub cmp_ver($$) return $v1_sublevel <=> $v2_sublevel; } -process_config("linux/config.h"); +process_config("linux/autoconf.h"); parse_versions; @@ -402,13 +398,14 @@ close OUT; # These options should default to off disable_config('DVB_AV7110_FIRMWARE'); disable_config('DVB_CINERGYT2_TUNING'); +disable_config('DVB_FE_CUSTOMISE'); # Hack for check sound/oss/aci.h header my $mirodep="$kernel/sound/oss/aci.h"; -if (!open IN, $mirodep) { +if (! -e $mirodep) { my $key="RADIO_MIROPCM20"; -print <<"EOF2"; + print <<"EOF2"; $key: $mirodep is missing. ***WARNING:*** You do not have the full kernel sources installed. @@ -431,7 +428,6 @@ Please see your distro's web site for instructions to build a new kernel. EOF2 $kernopts{$key}='n'; } -close IN; # Recursively check for broken dependencies my $i; -- cgit v1.2.3 From 194776fdadfd671ede360e46803ae6fcda75cb79 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Wed, 2 Aug 2006 08:01:17 -0300 Subject: Konicawc - handle errors from input_register_device() From: Dmitry Torokhov Compile-tested only (no hardware) Signed-off-by: Dmitry Torokhov Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/usbvideo/konicawc.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/linux/drivers/media/video/usbvideo/konicawc.c b/linux/drivers/media/video/usbvideo/konicawc.c index 1feaf5f0b..1e8cf4485 100644 --- a/linux/drivers/media/video/usbvideo/konicawc.c +++ b/linux/drivers/media/video/usbvideo/konicawc.c @@ -228,6 +228,7 @@ static void konicawc_adjust_picture(struct uvd *uvd) static void konicawc_register_input(struct konicawc *cam, struct usb_device *dev) { struct input_dev *input_dev; + int error; usb_make_path(dev, cam->input_physname, sizeof(cam->input_physname)); strncat(cam->input_physname, "/input0", sizeof(cam->input_physname)); @@ -248,7 +249,13 @@ static void konicawc_register_input(struct konicawc *cam, struct usb_device *dev input_dev->private = cam; - input_register_device(cam->input); + error = input_register_device(cam->input); + if (error) { + warn("Failed to register camera's input device, err: %d\n", + error); + input_free_device(cam->input); + cm->input = NULL; + } } static void konicawc_unregister_input(struct konicawc *cam) -- cgit v1.2.3 From 3c26caca00b26cc247a0aeb187be7ad804c73cba Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Wed, 2 Aug 2006 08:09:47 -0300 Subject: Fix a typo on the previous patch From: Mauro Carvalho Chehab Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/usbvideo/konicawc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/drivers/media/video/usbvideo/konicawc.c b/linux/drivers/media/video/usbvideo/konicawc.c index 1e8cf4485..8c0e25fde 100644 --- a/linux/drivers/media/video/usbvideo/konicawc.c +++ b/linux/drivers/media/video/usbvideo/konicawc.c @@ -254,7 +254,7 @@ static void konicawc_register_input(struct konicawc *cam, struct usb_device *dev warn("Failed to register camera's input device, err: %d\n", error); input_free_device(cam->input); - cm->input = NULL; + cam->input = NULL; } } -- cgit v1.2.3 From c3c47fd1bb07ca6c9e79e921396ae540ebf636b9 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Wed, 2 Aug 2006 08:10:37 -0300 Subject: Added cross-dependecy check at the end of compilation cycle From: Mauro Carvalho Chehab Signed-off-by: Mauro Carvalho Chehab --- v4l/Makefile | 2 +- v4l/scripts/rmmod.pl | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/v4l/Makefile b/v4l/Makefile index 63d3fe48a..3e9336a95 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -33,7 +33,7 @@ endif default:: config-compat.h Makefile.media links .version echo srcdir $(SRCDIR) $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules - + ./scripts/rmmod.pl check ################################################# # Object specific rules diff --git a/v4l/scripts/rmmod.pl b/v4l/scripts/rmmod.pl index 19a0a8c61..ade231707 100755 --- a/v4l/scripts/rmmod.pl +++ b/v4l/scripts/rmmod.pl @@ -173,22 +173,22 @@ if ($mode eq "load") { prepare_cmd; parse_loaded; rmmod; + } elsif ($mode eq "reload") { + prepare_cmd; + parse_loaded; + my @modlist2=@modlist; + rmmod; + @modlist=@modlist2; + insmod(0); + } elsif ($mode eq "debug") { + prepare_cmd; + parse_loaded; + insmod(1); + } elsif ($mode eq "check") { + prepare_cmd; + parse_loaded; } else { - if ($mode eq "reload") { - prepare_cmd; - parse_loaded; - my @modlist2=@modlist; - rmmod; - @modlist=@modlist2; - insmod(0); - } else { - if ($mode eq "debug") { - prepare_cmd; - parse_loaded; - insmod(1); - } else { - printf "Usage: $0 [load|unload|reload]\n"; - } - } + printf "Usage: $0 [load|unload|reload|debug|check]\n"; } } + -- cgit v1.2.3