diff -ruN nvidia-96.43.10.orig/nv-i2c.c nvidia-96.43.10.new/nv-i2c.c
--- nvidia-96.43.10.orig/nv-i2c.c	2009-08-20 15:39:20.000000000 +0100
+++ nvidia-96.43.10.new/nv-i2c.c	2009-08-20 16:03:48.000000000 +0100
@@ -196,8 +196,6 @@
 #if defined(NV_I2C_ADAPTER_HAS_DEC_USE)
     .dec_use           = nv_i2c_adapter_dec_use,
 #endif
-    .client_register   = nv_i2c_adapter_register_client,
-    .client_unregister = nv_i2c_adapter_unregister_client,
     .data              = NULL,
 };
 
@@ -219,8 +217,6 @@
     .owner             = THIS_MODULE,
     .algo              = &nv_i2c_algo,
     .algo_data         = NULL,
-    .client_register   = nv_i2c_adapter_register_client,
-    .client_unregister = nv_i2c_adapter_unregister_client,
 };
 
 #endif // defined(KERNEL_2_4)
diff -ruN nvidia-96.43.10.orig/os-agp.c nvidia-96.43.10.new/os-agp.c
--- nvidia-96.43.10.orig/os-agp.c	2009-08-20 15:39:20.000000000 +0100
+++ nvidia-96.43.10.new/os-agp.c	2009-08-20 16:03:48.000000000 +0100
@@ -284,7 +284,7 @@
     {
          nv_pte_t *page_ptr = at->page_table[i];
 
-         page_ptr->phys_addr = (ptr->memory[i] & PAGE_MASK);
+	 page_ptr->phys_addr = (page_to_phys(ptr->pages[i]) & PAGE_MASK);
          page_ptr->virt_addr = (unsigned long) __va(page_ptr->phys_addr);
          page_ptr->dma_addr  = page_ptr->phys_addr;
     }