Oops. Here's the patch:
- Jim
--- qc-usb-0.6.6.orig/qc-driver.c 2009-08-25 23:17:04.000000000 -0400
+++ qc-usb-0.6.6/qc-driver.c 2009-08-25 23:38:31.000000000 -0400
@@ -996,7 +996,9 @@
PRINTK(KERN_WARNING,"Could not register procfs file entry");
return -ENXIO;
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
entry->owner = THIS_MODULE;
+#endif
entry->data = qc;
entry->read_proc = qc_proc_read;
entry->write_proc = qc_proc_write;
@@ -1034,7 +1036,9 @@
return -ENXIO;
}
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
qc_proc_entry->owner = THIS_MODULE;
+#endif
return 0;
}
/* }}} */
@@ -2303,7 +2307,11 @@
/* }}} */
/* {{{ [fold] qc_v4l_open(struct video_device *dev, int flags) */
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30)
+static int qc_v4l_open(struct file *file)
+#else
static int qc_v4l_open(struct inode *inode, struct file *file)
+#endif
#else
static int qc_v4l_open(struct video_device *dev, int flags)
#endif
@@ -2375,7 +2383,11 @@
/* }}} */
/* {{{ [fold] qc_v4l_close(struct video_device *dev) */
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30)
+static int qc_v4l_close(struct file *file)
+#else
static int qc_v4l_close(struct inode *inode, struct file *file)
+#endif
#else
static void qc_v4l_close(struct video_device *dev)
#endif
@@ -2520,7 +2532,11 @@
/* }}} */
/* {{{ [fold] qc_v4l_ioctl(struct video_device *dev, unsigned int cmd, void *arg) */
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30)
+static int qc_v4l_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+#else
static int qc_v4l_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
+#endif
#else
static int qc_v4l_ioctl(struct video_device *dev, unsigned int cmd, void *argp)
#endif
@@ -3021,7 +3037,11 @@
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
static void qc_v4l_release(struct video_device *vfd) { }
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30)
+static struct v4l2_file_operations qc_v4l_fops = {
+#else
static struct file_operations qc_v4l_fops = {
+#endif
owner: THIS_MODULE,
open: qc_v4l_open,
release: qc_v4l_close,
