Index: NVIDIA-Linux-x86-295.20/kernel/conftest.sh
===================================================================
--- NVIDIA-Linux-x86-295.20.orig/kernel/conftest.sh
+++ NVIDIA-Linux-x86-295.20/kernel/conftest.sh
@@ -95,7 +95,7 @@ build_cflags() {
         fi
     fi
 
-    CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
+    CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$OUTOUT/arch/x86/include/generated $AUTOCONF_CFLAGS"
 
     test_xen
 
@@ -126,7 +126,7 @@ build_cflags() {
     CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
 
     if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
-        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include"
+        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$OUTPUT/arch/x86/include/generated"
     elif [ "$ARCH" = "ARMv7" ]; then
         CFLAGS="$CFLAGS -I$SOURCES/arch/arm/include"
     fi
@@ -980,6 +980,7 @@ compile_test() {
 
             echo "$CONFTEST_PREAMBLE
             #include <linux/acpi.h>
+	    #include <acpi/acpixf.h>
             void conftest_acpi_walk_namespace(void) {
                 acpi_walk_namespace(0, NULL, 0, NULL, NULL, NULL, NULL);
             }" > conftest$$.c
@@ -1560,7 +1561,7 @@ case "$6" in
             #endif
             #if defined(TEST_2_6_OR_3) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0))
               #error \"!KERNEL_2_6_OR_3\"
-            #endif" > conftest$$.c
+            #endif " > conftest$$.c
 
             $CC $CFLAGS -DTEST_2_6_OR_3 -c conftest$$.c > /dev/null 2>&1
 
@@ -1604,6 +1605,9 @@ case "$6" in
             fi
         fi
 
+	RET=0
+	SELECTED_MAKEFILE=Makefile.kbuild
+
         if [ "$RET" = "0" ]; then
             ln -s $SELECTED_MAKEFILE Makefile
             exit 0