From ec587d5a2c052529e35797c42522fde8a9efa1b7 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 23 Feb 2009 12:36:38 -0300 Subject: sq905 require 2.6.20 or upper From: Mauro Carvalho Chehab Priority: normal Signed-off-by: Mauro Carvalho Chehab --- v4l/versions.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'v4l') diff --git a/v4l/versions.txt b/v4l/versions.txt index ac0266047..8435046c5 100644 --- a/v4l/versions.txt +++ b/v4l/versions.txt @@ -37,6 +37,8 @@ USB_SI470X USB_GSPCA_FINEPIX # uses linux/hid.h and struct delayed_work USB_SI470X +# due to INIT_WORK changes +USB_GSPCA_SQ905 [2.6.19] #This driver were developed at kernel 2.6.19, requiring vmalloc_user/remap_vmalloc_range -- cgit v1.2.3 From 16df90925e049fa40b6c66c5f4e41b3178aae629 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 26 Feb 2009 11:35:36 -0300 Subject: Add dvb spec rules at the makefile From: Mauro Carvalho Chehab Priority: normal Signed-off-by: Mauro Carvalho Chehab --- v4l/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'v4l') diff --git a/v4l/Makefile b/v4l/Makefile index da51bb50a..512b355f4 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -48,9 +48,14 @@ default:: config-compat.h Makefile.media links oss firmware:: $(MAKE) -C firmware -spec:: +v4l2-spec:: $(MAKE) -C ../v4l2-spec +dvb-spec:: + $(MAKE) -C ../dvb-spec/dvbapi + +spec:: v4l2-spec dvb-spec + apps:: $(MAKE) -C ../v4l2-apps @@ -288,6 +293,7 @@ clean:: config-compat.h Module.symvers Module.markers modules.order $(MAKE) -C firmware $@ $(MAKE) -C ../v4l2-spec $@ + $(MAKE) -C ../dvb-spec/dvbapi $@ $(MAKE) -C ../v4l2-apps $@ distclean:: clean -- cgit v1.2.3 From c94eede342d36bb236464419bc6014fa12d4d843 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Thu, 19 Feb 2009 21:26:11 +0100 Subject: v4l-dvb: work around an autoconf.h include in mmdebug.h From: Hans Verkuil mmdebug.h (included by mm.h) includes autoconf.h in turn. This will overwrite the local v4l config with the kernel's config. If this header is present, then include it in the generated config-compat.h before we set our local v4l config. This way it won't be included again later. mmdebug.h appeared in 2.6.28. Priority: normal Signed-off-by: Hans Verkuil --- v4l/scripts/make_config_compat.pl | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'v4l') diff --git a/v4l/scripts/make_config_compat.pl b/v4l/scripts/make_config_compat.pl index d24b5f718..423dcff77 100755 --- a/v4l/scripts/make_config_compat.pl +++ b/v4l/scripts/make_config_compat.pl @@ -277,6 +277,13 @@ open IN, "<$infile" or die "File not found: $infile"; $out.= "#ifndef __CONFIG_COMPAT_H__\n"; $out.= "#define __CONFIG_COMPAT_H__\n\n"; $out.= "#include \n\n"; + +# mmdebug.h includes autoconf.h. So if this header exists, +# then include it before our config is set. +if (-f "$kdir/include/linux/mmdebug.h") { + $out.= "#include \n\n"; +} + while() { next unless /^(\S+)\s*:= (\S+)$/; $out.= "#undef $1\n"; -- cgit v1.2.3