Index: ov51x-jpeg.h
===================================================================
--- ov51x-jpeg.h	(revision 103)
+++ ov51x-jpeg.h	(working copy)
@@ -59,6 +59,9 @@
 }
 
 #include <media/v4l2-common.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+#include <media/v4l2-ioctl.h>
+#endif
 
 /* --------------------------------- */
 /* DEFINES FOR OV511 AND OTHER CHIPS */
Index: ov51x-jpeg-core.c
===================================================================
--- ov51x-jpeg-core.c	(revision 103)
+++ ov51x-jpeg-core.c	(working copy)
@@ -86,7 +86,7 @@
 
 #include <linux/autoconf.h>
 
-#define OV51x_JPEG_VERSION "1.5.7"
+#define OV51x_JPEG_VERSION "1.5.8a"
 
 
 #if defined(OUTSIDE_KERNEL)
@@ -112,7 +112,11 @@
 #include <linux/slab.h>
 #include <linux/ctype.h>
 #include <linux/pagemap.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27)
 #include <asm/semaphore.h>
+#else
+#include <linux/semaphore.h>
+#endif
 #include <asm/processor.h>
 
 #if defined (__i386__)
@@ -6634,9 +6638,13 @@
 };
 
 static struct video_device vdev_template = {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27)
 	.owner =	THIS_MODULE,
+#endif
 	.name =		"OV51x USB Camera",
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27)
 	.type =		VID_TYPE_CAPTURE,
+#endif
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24)
 	.hardware =	VID_HARDWARE_OV511,
 #endif
@@ -8365,7 +8373,7 @@
 		goto error;
 
 	memcpy(ov->vdev, &vdev_template, sizeof(*ov->vdev));
-	ov->vdev->dev = &dev->dev;
+	ov->vdev->dev = dev->dev;
 	video_set_drvdata(ov->vdev, ov);
 
 	for (i = 0; i < OV511_MAX_UNIT_VIDEO; i++) {