diff -rupN nvidia-185.18.14.orig/nv-i2c.c nvidia-185.18.14.new/nv-i2c.c --- nvidia-185.18.14.orig/nv-i2c.c 2009-06-30 15:11:50.000000000 +0100 +++ nvidia-185.18.14.new/nv-i2c.c 2009-06-30 15:41:23.000000000 +0100 @@ -218,8 +218,6 @@ struct i2c_adapter nv_i2c_adapter_protot #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, }; @@ -241,8 +239,6 @@ struct i2c_adapter nv_i2c_adapter_protot .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 -rupN nvidia-185.18.14.orig/os-agp.c nvidia-185.18.14.new/os-agp.c --- nvidia-185.18.14.orig/os-agp.c 2009-06-30 15:11:50.000000000 +0100 +++ nvidia-185.18.14.new/os-agp.c 2009-06-30 15:12:58.000000000 +0100 @@ -293,7 +293,7 @@ RM_STATUS KernLoadAGPPages( { 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; }