diff -u nvidia-graphics-drivers-195.36.24/debian/dkms.conf.in nvidia-graphics-drivers-195.36.24/debian/dkms.conf.in
--- nvidia-graphics-drivers-195.36.24/debian/dkms.conf.in
+++ nvidia-graphics-drivers-195.36.24/debian/dkms.conf.in
@@ -16,0 +17 @@
+PATCH[1]="unlocked_ioctl.patch"
diff -u nvidia-graphics-drivers-195.36.24/debian/dkms.conf nvidia-graphics-drivers-195.36.24/debian/dkms.conf
--- nvidia-graphics-drivers-195.36.24/debian/dkms.conf
+++ nvidia-graphics-drivers-195.36.24/debian/dkms.conf
@@ -16,0 +17 @@
+PATCH[1]="unlocked_ioctl.patch"
diff -u nvidia-graphics-drivers-195.36.24/debian/changelog nvidia-graphics-drivers-195.36.24/debian/changelog
--- nvidia-graphics-drivers-195.36.24/debian/changelog
+++ nvidia-graphics-drivers-195.36.24/debian/changelog
@@ -1,3 +1,10 @@
+nvidia-graphics-drivers (195.36.24-0ubuntu2~10.04) lucid; urgency=low
+
+  * debian/dkms/patches, dkms.conf.in:
+    - New patch unlocked_ioctl.patch to fix a build error (LP#653910)
+
+ -- Paul van Genderen <paulvg@member.fsf.org>  Fri, 04 Feb 2011 17:26:34 +0100
+
 nvidia-graphics-drivers (195.36.24-0ubuntu1~10.04) lucid-proposed; urgency=low
 
   * New upstream release:
only in patch2:
unchanged:
--- nvidia-graphics-drivers-195.36.24.orig/debian/dkms/patches/unlocked_ioctl.patch
+++ nvidia-graphics-drivers-195.36.24/debian/dkms/patches/unlocked_ioctl.patch
@@ -0,0 +1,14 @@
+diff -durN nvidia-current-195.36.24.orig/nv.c nvidia-current-195.36.24/nv.c
+--- nvidia-current-195.36.24.orig/nv.c	2010-05-27 11:24:06.000000000 +0200
++++ nvidia-current-195.36.24/nv.c	2011-02-04 17:03:34.000000000 +0100
+@@ -414,10 +414,7 @@
+ static struct file_operations nv_fops = {
+     .owner     = THIS_MODULE,
+     .poll      = nv_kern_poll,
+-    .ioctl     = nv_kern_ioctl,
+-#if defined(HAVE_UNLOCKED_IOCTL)
+     .unlocked_ioctl = nv_kern_unlocked_ioctl,
+-#endif
+ #if defined(NVCPU_X86_64) && defined(HAVE_COMPAT_IOCTL)
+     .compat_ioctl = nv_kern_compat_ioctl,
+ #endif