diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-26 21:02:33 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-26 21:02:33 -0300 |
| commit | eb20179da88acc42ffee334ce86bacdf77d4a438 (patch) | |
| tree | 9f2196b723853e3d581b0b87b3f2ce666fc769be /v4l | |
| parent | 1e4553680f02af66c3282072f581425637b58f78 (diff) | |
| parent | 7dab4777ac8eda4056484c99285d58b6b3a91235 (diff) | |
| download | mediapointer-dvb-s2-eb20179da88acc42ffee334ce86bacdf77d4a438.tar.gz mediapointer-dvb-s2-eb20179da88acc42ffee334ce86bacdf77d4a438.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-zoran
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/Makefile | 8 | ||||
| -rwxr-xr-x | v4l/scripts/make_config_compat.pl | 7 | ||||
| -rw-r--r-- | v4l/versions.txt | 2 |
3 files changed, 16 insertions, 1 deletions
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 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 <linux/autoconf.h>\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 <linux/mmdebug.h>\n\n"; +} + while(<IN>) { next unless /^(\S+)\s*:= (\S+)$/; $out.= "#undef $1\n"; 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 |