diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-11-19 20:07:32 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-11-19 20:07:32 -0200 |
| commit | a502b729bcbb8725a3bdcc896c0930399e23a40f (patch) | |
| tree | 6e4b536337d9f96a8070ef020bd2c8f4231b96ca | |
| parent | ab3397f7245f69677f55722ea8ee1c2a4f9a23ad (diff) | |
| parent | e332e5a0cd73199965b31198ae978e5a4d4eea08 (diff) | |
| download | mediapointer-dvb-s2-a502b729bcbb8725a3bdcc896c0930399e23a40f.tar.gz mediapointer-dvb-s2-a502b729bcbb8725a3bdcc896c0930399e23a40f.tar.bz2 | |
merge: http://linuxtv.org/hg/~tap/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | v4l/Makefile | 2 | ||||
| -rw-r--r-- | v4l/compat.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/v4l/Makefile b/v4l/Makefile index ef5b583c0..5d77977cc 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -237,7 +237,7 @@ config-compat.h:: .myconfig @perl \ -e 'print "#ifndef __CONFIG_COMPAT_H__\n";' \ -e 'print "#define __CONFIG_COMPAT_H__\n\n";' \ - -e 'print "#include <linux/config.h>\n\n";' \ + -e 'print "#include <linux/autoconf.h>\n\n";' \ -e 'while(<>) {' \ -e ' next unless /^(\S+)\s*:= (\S+)$$/;' \ -e ' print "#undef $$1\n";' \ diff --git a/v4l/compat.h b/v4l/compat.h index b245c95e2..19d648d5e 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -311,8 +311,8 @@ usb_to_input_id(const struct usb_device *dev, struct input_id *id) } #endif -#ifndef PCIAGP_FAIL - #define PCIAGP_FAIL 0 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) +# define PCIAGP_FAIL 0 #endif #ifndef true |