--- nv.c.alt	2009-03-02 23:49:19 +0300
+++ nv.c	2009-06-08 15:42:52 +0400
@@ -607,9 +607,11 @@ static void nvos_proc_create(void)
      * Set the module owner to ensure that the reference
      * count reflects accesses to the proc files.
      */
+#if defined(NV_PROC_DIR_ENTRY_HAS_OWNER)
     proc_nvidia->owner = THIS_MODULE;
     proc_nvidia_cards->owner = THIS_MODULE;
     proc_nvidia_warnings->owner = THIS_MODULE;
+#endif
 
     for (j = 0; j < num_nv_devices; j++)
     {
@@ -629,7 +631,9 @@ static void nvos_proc_create(void)
 
         entry->data = nv;
         entry->read_proc = nv_kern_read_cardinfo;
+#if defined(NV_PROC_DIR_ENTRY_HAS_OWNER)
         entry->owner = THIS_MODULE;
+#endif
 
         if (nvos_find_agp_capability(dev)) {
             /*
@@ -642,7 +646,9 @@ static void nvos_proc_create(void)
                 goto failed;
             }
 
+#if defined(NV_PROC_DIR_ENTRY_HAS_OWNER)
             entry->owner = THIS_MODULE;
+#endif
             proc_nvidia_agp = entry;
 
             entry = create_proc_entry("status", flags, proc_nvidia_agp);
@@ -653,7 +659,9 @@ static void nvos_proc_create(void)
 
             entry->data = nv;
             entry->read_proc = nv_kern_read_status;
+#if defined(NV_PROC_DIR_ENTRY_HAS_OWNER)
             entry->owner = THIS_MODULE;
+#endif
 
             entry = create_proc_entry("host-bridge", flags, proc_nvidia_agp);
             if (!entry) {
@@ -663,7 +671,9 @@ static void nvos_proc_create(void)
 
             entry->data = NULL;
             entry->read_proc = nv_kern_read_agpinfo;
+#if defined(NV_PROC_DIR_ENTRY_HAS_OWNER)
             entry->owner = THIS_MODULE;
+#endif
 
             entry = create_proc_entry("card", flags, proc_nvidia_agp);
             if (!entry) {
@@ -673,7 +683,9 @@ static void nvos_proc_create(void)
 
             entry->data = nv;
             entry->read_proc = nv_kern_read_agpinfo;
+#if defined(NV_PROC_DIR_ENTRY_HAS_OWNER)
             entry->owner = THIS_MODULE;
+#endif
         }
 
         NV_PCI_DEV_PUT(dev);
@@ -684,14 +696,18 @@ static void nvos_proc_create(void)
         goto failed;
 
     entry->read_proc = nv_kern_read_version;
+#if defined(NV_PROC_DIR_ENTRY_HAS_OWNER)
     entry->owner = THIS_MODULE;
+#endif
 
     entry = create_proc_entry("registry", flags, proc_nvidia);
     if (!entry)
         goto failed;
 
     entry->read_proc = nv_kern_read_registry;
+#if defined(NV_PROC_DIR_ENTRY_HAS_OWNER)
     entry->owner = THIS_MODULE;
+#endif
 
     return;
 
@@ -718,8 +734,10 @@ nvos_proc_add_warning_file(
 
     entry->data = (void *)message;
     entry->read_proc = nv_kern_read_warning;
+#if defined(NV_PROC_DIR_ENTRY_HAS_OWNER)
     entry->owner = THIS_MODULE;
 #endif
+#endif
 }
 
 #ifdef CONFIG_PROC_FS