diff options
-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 |