summaryrefslogtreecommitdiffstats
path: root/abs/core/plextor-convertX-driver/wis-go7007-2.6.26-nopage.diff
blob: 2fd1cca4a6368271048896c3622704877597de31 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
diff -urN wis-go7007-linux-0.9.8.orig/kernel/go7007-v4l2.c wis-go7007-linux-0.9.8/kernel/go7007-v4l2.c
--- wis-go7007-linux-0.9.8.orig/kernel/go7007-v4l2.c	2007-05-09 13:56:07.000000000 -0400
+++ wis-go7007-linux-0.9.8/kernel/go7007-v4l2.c	2008-08-03 16:01:35.000000000 -0400
@@ -1375,6 +1375,7 @@
 	}
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
 /* This is really only going to ever be called when we
  * do get_user_pages() in VIDIOC_QBUF */
 static struct page *go7007_vm_nopage(struct vm_area_struct *vma,
@@ -1392,11 +1393,14 @@
 		*type = VM_FAULT_MINOR;
 	return page;
 }
+#endif
 
 static struct vm_operations_struct go7007_vm_ops = {
 	.open	= go7007_vm_open,
 	.close	= go7007_vm_close,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
 	.nopage	= go7007_vm_nopage,
+#endif
 };
 
 static int go7007_mmap(struct file *file, struct vm_area_struct *vma)