diff options
Diffstat (limited to 'media-video/ov51x-jpeg/files')
-rw-r--r-- | media-video/ov51x-jpeg/files/1.5.9-2.6.29_final.patch | 88 | ||||
-rw-r--r-- | media-video/ov51x-jpeg/files/1.5.9-kernel-messages.patch | 17 |
2 files changed, 0 insertions, 105 deletions
diff --git a/media-video/ov51x-jpeg/files/1.5.9-2.6.29_final.patch b/media-video/ov51x-jpeg/files/1.5.9-2.6.29_final.patch deleted file mode 100644 index 7477c5e2b..000000000 --- a/media-video/ov51x-jpeg/files/1.5.9-2.6.29_final.patch +++ /dev/null @@ -1,88 +0,0 @@ ---- ov51x-jpeg-1.5.9/ov51x-jpeg-core.c 2008-09-28 12:58:09.000000000 +0200 -+++ ov51x-jpeg-1.5.9/ov51x-jpeg-core.c.new 2009-05-31 18:19:39.000000000 +0200 -@@ -539,7 +539,7 @@ - - static struct file_operations ov511_control_fops = { - .ioctl = ov51x_control_ioctl, --#ifdef CONFIG_COMPAT -+#if defined(CONFIG_COMPAT) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) - .compat_ioctl = v4l_compat_ioctl32, - #endif - }; -@@ -5733,7 +5733,7 @@ - { - #else - static int --ov51x_v4l1_open(struct inode *inode, struct file *file) -+ov51x_v4l1_open(struct file *file) - { - struct video_device *vdev = video_devdata(file); - #endif -@@ -5804,7 +5804,7 @@ - { - #else - static int --ov51x_v4l1_close(struct inode *inode, struct file *file) -+ov51x_v4l1_close(struct file *file) - { - struct video_device *vdev = file->private_data; - #endif -@@ -5850,13 +5850,15 @@ - } - - /* Do not call this function directly! */ --static int -+ - #ifdef OV511_OLD_V4L -+static int - ov51x_v4l1_ioctl_internal(struct usb_ov511 *ov, unsigned int cmd, - void *arg) - { - #else --ov51x_v4l1_ioctl_internal(struct inode *inode, struct file *file, -+static long -+ov51x_v4l1_ioctl_internal(struct file *file, - unsigned int cmd, void *arg) - { - struct video_device *vdev = file->private_data; -@@ -6372,8 +6374,8 @@ - - #else /* If new V4L API */ - --static int --ov51x_v4l1_ioctl(struct inode *inode, struct file *file, -+static long -+ov51x_v4l1_ioctl(struct file *file, - unsigned int cmd, unsigned long arg) - { - struct video_device *vdev = file->private_data; -@@ -6383,7 +6385,7 @@ - if (down_interruptible(&ov->lock)) - return -EINTR; - -- rc = video_usercopy(inode, file, cmd, arg, ov51x_v4l1_ioctl_internal); -+ rc = video_usercopy(file, cmd, arg, ov51x_v4l1_ioctl_internal); - - up(&ov->lock); - return rc; -@@ -6624,17 +6626,17 @@ - - #else /* New V4L API */ - --static struct file_operations ov511_fops = { -+static struct v4l2_file_operations ov511_fops = { - .owner = THIS_MODULE, - .open = ov51x_v4l1_open, - .release = ov51x_v4l1_close, - .read = ov51x_v4l1_read, - .mmap = ov51x_v4l1_mmap, - .ioctl = ov51x_v4l1_ioctl, --#ifdef CONFIG_COMPAT -+#if defined(CONFIG_COMPAT) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) - .compat_ioctl = v4l_compat_ioctl32, - #endif -- .llseek = no_llseek, -+// .llseek = no_llseek, - }; - - static struct video_device vdev_template = { diff --git a/media-video/ov51x-jpeg/files/1.5.9-kernel-messages.patch b/media-video/ov51x-jpeg/files/1.5.9-kernel-messages.patch deleted file mode 100644 index e8b29f7a3..000000000 --- a/media-video/ov51x-jpeg/files/1.5.9-kernel-messages.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Nur ov51x-jpeg-1.5.9-old/ov51x-jpeg.h ov51x-jpeg-1.5.9/ov51x-jpeg.h ---- ov51x-jpeg-1.5.9-old/ov51x-jpeg.h 2009-05-04 19:42:00.000000000 +0300 -+++ ov51x-jpeg-1.5.9/ov51x-jpeg.h 2009-05-04 19:43:01.000000000 +0300 -@@ -63,6 +63,12 @@ - #include <media/v4l2-ioctl.h> - #endif - -+/* Add missing info and warn macros by hand for new kernels */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28) -+#define info(args...) printk(KERN_INFO KBUILD_MODNAME args) -+#define warn(args...) printk(KERN_WARNING KBUILD_MODNAME args) -+#endif -+ - /* --------------------------------- */ - /* DEFINES FOR OV511 AND OTHER CHIPS */ - /* --------------------------------- */ - |