diff -U4 -r NVIDIA-Linux-x86-1.0-7174-pkg0/usr/src/nv/conftest.sh NVIDIA-Linux-x86-1.0-7174-pkg0+byte/usr/src/nv/conftest.sh
--- NVIDIA-Linux-x86-1.0-7174-pkg0/usr/src/nv/conftest.sh	2005-03-22 15:36:23.000000000 +0000
+++ NVIDIA-Linux-x86-1.0-7174-pkg0+byte/usr/src/nv/conftest.sh	2006-06-23 02:51:09.000000000 +0100
@@ -27,9 +27,10 @@
         #
         # Determine the number of arguments expected by remap_page_range.
         #
 
-        echo "#include <linux/mm.h>
+        echo "#include <linux/config.h>
+        #include <linux/mm.h>
         int nv_remap_page_range(void) {
            pgprot_t pgprot = __pgprot(0);
            remap_page_range(NULL, 0L, 0L, 0L, pgprot);
         }" > conftest$$.c
@@ -42,9 +43,10 @@
           rm -f conftest$$.o
           exit 0
         fi
 
-        echo "#include <linux/mm.h>
+        echo "#include <linux/config.h>
+        #include <linux/mm.h>
         int nv_remap_page_range(void) {
            pgprot_t pgprot = __pgprot(0);
            remap_page_range(0L, 0L, 0L, pgprot);
         }" > conftest$$.c
@@ -381,9 +383,10 @@
         #
         # Determine if pci_disable_device() is present
         #
 
-        echo "#include <linux/pci.h>
+        echo "#include <linux/config.h>
+        #include <linux/pci.h>
         void nv_pci_disable_device(struct pci_dev *dev) {
             pci_disable_device(dev);
         }" > conftest$$.c
 
@@ -402,9 +405,10 @@
         #
         # Determine if class_simple_create() is present.
         #
 
-        echo "#include <linux/device.h>
+        echo "#include <linux/config.h>
+        #include <linux/device.h>
         struct class_simple*
         nv_class_simple_create(struct module *owner, char *name) {
             return class_simple_create(owner, name);
         }" > conftest$$.c
@@ -424,9 +428,10 @@
         #
         # Determine if pci_get_class() is present.
         #
 
-        echo "#include <linux/pci.h>
+        echo "#include <linux/config.h>
+        #include <linux/pci.h>
         struct pci_dev*
         nv_pci_get_class(unsigned int class, struct pci_dev *from) {
             return pci_get_class(class, from);
         }" > conftest$$.c
@@ -446,9 +451,10 @@
         #
         # Determine if remap_pfn_range() is present.
         #
 
-        echo "#include <linux/mm.h>
+        echo "#include <linux/config.h>
+        #include <linux/mm.h>
         int nv_remap_pfn_range(void) {
             pgprot_t pgprot = __pgprot(0);
             remap_pfn_range(NULL, 0L, 0L, 0L, pgprot);
         }" > conftest$$.c
@@ -506,9 +512,10 @@
         #
         # Is 'rlim' a member of current->signal?
         #
 
-        echo "#include <linux/sched.h>
+        echo "#include <linux/config.h>
+        #include <linux/sched.h>
         struct rlimit *nv_signal_struct_rlim(void) {
             return current->signal->rlim;
         }" > conftest$$.c
 
@@ -528,9 +535,10 @@
         # Determine if agp_backend_acquire() is multi-bridge
         # aware.
         #
 
-        echo "#include <linux/types.h>
+        echo "#include <linux/config.h>
+        #include <linux/types.h>
         #include <linux/agp_backend.h>
         typedef struct agp_bridge_data agp_bridge_data;
         agp_bridge_data *nv_agp_backend_acquire(struct pci_dev *dev) {
             return agp_backend_acquire(dev);
@@ -551,9 +559,10 @@
         #
         # Determine, if vmap() is present, and how many arguments it takes
         #
 
-        echo "#include <linux/vmalloc.h>
+        echo "#include <linux/config.h>
+        #include <linux/vmalloc.h>
         void *nv_vmap(struct page **pg, int cnt) {
             return vmap(pg, cnt);
         }" > conftest$$.c
         $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
@@ -564,9 +573,10 @@
             echo 2
             exit 0
         fi
 
-        echo "#include <linux/vmalloc.h>
+        echo "#include <linux/config.h>
+        #include <linux/vmalloc.h>
         #include <linux/mm.h>
         void *nv_vmap(struct page **pg, int cnt) {
             return vmap(pg, cnt, 0, PAGE_KERNEL);
         }" > conftest$$.c