aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil-cisco@xs4all.nl>2019-04-26 06:50:33 (GMT)
committerHans Verkuil <hverkuil-cisco@xs4all.nl>2019-04-26 06:50:33 (GMT)
commitaa63c3fe5252e34a7a342d5eb7a0686d35f4d6d4 (patch)
treec3c5c8b8ccaa3c6e61c421fbb3e66d723deb09a4
parentba50779fd4c373d46c2dbe94515cc0ebcdc974dc (diff)
backport patches: remove zoran patches
The zoran driver was removed, so update any patches that touch the zoran driver. Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
-rw-r--r--backports/v2.6.31_vm_ops.patch13
-rw-r--r--backports/v4.10_sched_signal.patch12
-rw-r--r--backports/v4.17_proc_create_single.patch35
3 files changed, 0 insertions, 60 deletions
diff --git a/backports/v2.6.31_vm_ops.patch b/backports/v2.6.31_vm_ops.patch
index d65b7ab..29e7ce5 100644
--- a/backports/v2.6.31_vm_ops.patch
+++ b/backports/v2.6.31_vm_ops.patch
@@ -37,19 +37,6 @@ index 2381b05..09b4a49 100644
.open = meye_vm_open,
.close = meye_vm_close,
};
-diff --git a/drivers/media/pci/zoran/zoran_driver.c b/drivers/media/pci/zoran/zoran_driver.c
-index e7e9840..1a3ee0f 100644
---- a/drivers/media/pci/zoran/zoran_driver.c
-+++ b/drivers/media/pci/zoran/zoran_driver.c
-@@ -2838,7 +2838,7 @@ zoran_vm_close (struct vm_area_struct *vma)
- mutex_unlock(&zr->resource_lock);
- }
-
--static const struct vm_operations_struct zoran_vm_ops = {
-+static struct vm_operations_struct zoran_vm_ops = {
- .open = zoran_vm_open,
- .close = zoran_vm_close,
- };
diff --git a/drivers/media/usb/gspca/gspca.c b/drivers/media/usb/gspca/gspca.c
index b7ae872..30a450e 100644
--- a/drivers/media/usb/gspca/gspca.c
diff --git a/backports/v4.10_sched_signal.patch b/backports/v4.10_sched_signal.patch
index fbed946..fd5cae4 100644
--- a/backports/v4.10_sched_signal.patch
+++ b/backports/v4.10_sched_signal.patch
@@ -245,18 +245,6 @@ index 2e5c346..09e86b3 100644
#include <linux/slab.h>
#include <linux/interrupt.h>
-diff --git a/drivers/staging/media/zoran/zoran_device.c b/drivers/staging/media/zoran/zoran_device.c
-index 40adcee..671907a 100644
---- a/drivers/staging/media/zoran/zoran_device.c
-+++ b/drivers/staging/media/zoran/zoran_device.c
-@@ -28,7 +28,6 @@
- #include <linux/module.h>
- #include <linux/vmalloc.h>
- #include <linux/ktime.h>
--#include <linux/sched/signal.h>
-
- #include <linux/interrupt.h>
- #include <linux/proc_fs.h>
diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
index a7b3f7c..a63034b 100644
--- a/include/media/v4l2-ioctl.h
diff --git a/backports/v4.17_proc_create_single.patch b/backports/v4.17_proc_create_single.patch
index fab7fba..05ed932 100644
--- a/backports/v4.17_proc_create_single.patch
+++ b/backports/v4.17_proc_create_single.patch
@@ -27,38 +27,3 @@ index d697e1a..fca36a4 100644
if (!pe)
return -ENOMEM;
-diff --git a/drivers/staging/media/zoran/videocodec.c b/drivers/staging/media/zoran/videocodec.c
-index 4427ae7..5ff23ef 100644
---- a/drivers/staging/media/zoran/videocodec.c
-+++ b/drivers/staging/media/zoran/videocodec.c
-@@ -344,6 +344,19 @@ static int proc_videocodecs_show(struct seq_file *m, void *v)
-
- return 0;
- }
-+
-+static int proc_videocodecs_open(struct inode *inode, struct file *file)
-+{
-+ return single_open(file, proc_videocodecs_show, NULL);
-+}
-+
-+static const struct file_operations videocodecs_proc_fops = {
-+ .owner = THIS_MODULE,
-+ .open = proc_videocodecs_open,
-+ .read = seq_read,
-+ .llseek = seq_lseek,
-+ .release = single_release,
-+};
- #endif
-
- /* ===================== */
-@@ -360,8 +373,7 @@ videocodec_init (void)
- VIDEOCODEC_VERSION);
-
- #ifdef CONFIG_PROC_FS
-- videocodec_proc_entry = proc_create_single("videocodecs", 0, NULL,
-- proc_videocodecs_show);
-+ videocodec_proc_entry = proc_create("videocodecs", 0, NULL, &videocodecs_proc_fops);
- if (!videocodec_proc_entry) {
- dprintk(1, KERN_ERR "videocodec: can't init procfs.\n");
- }
-

Privacy Policy