Hi, to fix building under kernel 2.6.38, I've modified the AUTOCONF_INCLUDED.patch to add:
--------------------------------------- +++ b/conftest.h 2011-03-24 10:44:17.000000000 -0400 @@ -303,6 +303,13 @@ #undef NV_LINUX_SEMAPHORE_H_PRESENT #endif +/* Check for generated/autoconfig.h */ +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,37) + #define NV_GENERATED_AUTOCONF_H_PRESENT +#else + #undef NV_GENERATED_AUTOCONF_H_PRESENT +#endif + /* Check for linux/cred.h */ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27) #define NV_LINUX_CRED_H_PRESENT --------------------------------------- I've attached my modified file. Cheers, -Pascal -- Homepage (http://organact.mine.nu) Debian GNU/Linux (http://www.debian.org) COMunité/LACIME: École de technologie supérieure (http://www.comunite.ca) Integrated Microsystems Laboratory: McGill (http://www.iml.ece.mcgill.ca)
From: Andreas Beckmann <deb...@abeckmann.de> Subject: Fix build of 173xx with 2.6.33 and newer kernels Index: b/nv-linux.h =================================================================== --- a/nv-linux.h 2010-06-10 15:24:01.824037317 +0000 +++ b/nv-linux.h 2010-06-10 15:24:25.120037815 +0000 @@ -15,11 +15,13 @@ #include "nv.h" #include "conftest.h" +#ifndef AUTOCONF_INCLUDED #if defined(NV_GENERATED_AUTOCONF_H_PRESENT) #include <generated/autoconf.h> #else #include <linux/autoconf.h> #endif +#endif #ifndef LINUX_VERSION_CODE #include <linux/version.h> --- a/conftest.h 2011-02-15 07:33:11.000000000 -0500 +++ b/conftest.h 2011-03-24 10:44:17.000000000 -0400 @@ -303,6 +303,13 @@ #undef NV_LINUX_SEMAPHORE_H_PRESENT #endif +/* Check for generated/autoconfig.h */ +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,37) + #define NV_GENERATED_AUTOCONF_H_PRESENT +#else + #undef NV_GENERATED_AUTOCONF_H_PRESENT +#endif + /* Check for linux/cred.h */ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27) #define NV_LINUX_CRED_H_PRESENT
