Common subdirectories: /usr/portage/distfiles/svn-src/r5u870/trunk/usbcam//.svn and /home/xerion/usbcam//.svn
diff -u /usr/portage/distfiles/svn-src/r5u870/trunk/usbcam//usbcam_buf.c /home/xerion/usbcam//usbcam_buf.c
--- /usr/portage/distfiles/svn-src/r5u870/trunk/usbcam//usbcam_buf.c	2008-10-15 22:12:16.000000000 +1100
+++ /home/xerion/usbcam//usbcam_buf.c	2011-01-14 22:10:40.676000082 +1100
@@ -528,7 +528,7 @@
 {
 	struct videobuf_dmabuf *dma = usbframe_get_dmabuf(&framep->vbb);
 	
-	videobuf_waiton(&framep->vbb, 0, 0);
+	videobuf_waiton(vq, &framep->vbb, 0, 0);
 	videobuf_dma_unmap(vq, dma);
 	videobuf_dma_free(dma);
 	if (framep->vbb.state != STATE_NEEDS_INIT) {
diff -u /usr/portage/distfiles/svn-src/r5u870/trunk/usbcam//usbcam_fops.c /home/xerion/usbcam//usbcam_fops.c
--- /usr/portage/distfiles/svn-src/r5u870/trunk/usbcam//usbcam_fops.c	2008-12-16 21:10:58.000000000 +1100
+++ /home/xerion/usbcam//usbcam_fops.c	2011-01-14 01:22:59.511000955 +1100
@@ -155,7 +155,7 @@
 			    &slock,
 			    V4L2_BUF_TYPE_VIDEO_CAPTURE,
 			    V4L2_FIELD_INTERLACED,
-			    sizeof(struct usbcam_frame), ufp);
+			    sizeof(struct usbcam_frame), ufp, NULL);
 #endif
 
 	mutex_lock(&udp->ud_open_lock);