The patch number 8101 was added via Hans Verkuil <[EMAIL PROTECTED]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
------
From: Hans Verkuil <[EMAIL PROTECTED]>
videodev: fix compilation issue for kernels < 2.6.25
Signed-off-by: Hans Verkuil <[EMAIL PROTECTED]>
---
linux/drivers/media/video/videodev.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff -r cde4614b3266 -r 63dbae485b10 linux/drivers/media/video/videodev.c
--- a/linux/drivers/media/video/videodev.c Sun Jun 22 09:11:40 2008 +0000
+++ b/linux/drivers/media/video/videodev.c Sun Jun 22 13:40:17 2008 +0200
@@ -375,8 +375,12 @@ EXPORT_SYMBOL(v4l_printk_ioctl);
* sysfs stuff
*/
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
+static ssize_t show_index(struct class_device *cd, char *buf)
+#else
static ssize_t show_index(struct device *cd,
struct device_attribute *attr, char *buf)
+#endif
{
struct video_device *vfd = container_of(cd, struct video_device,
class_dev);
@@ -394,6 +398,7 @@ static ssize_t show_name(struct device *
class_dev);
return sprintf(buf, "%.*s\n", (int)sizeof(vfd->name), vfd->name);
}
+
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
static ssize_t show_dev(struct class_device *cd, char *buf)
{
@@ -1947,6 +1952,7 @@ out:
}
EXPORT_SYMBOL(video_ioctl2);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
struct index_info {
struct device *dev;
unsigned int used[VIDEO_NUM_DEVICES];
@@ -2014,6 +2020,7 @@ out:
kfree(info);
return ret;
}
+#endif
static const struct file_operations video_fops;
@@ -2107,7 +2114,11 @@ int video_register_device_index(struct v
video_device[i]=vfd;
vfd->minor=i;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
ret = get_index(vfd, index);
+#else
+ ret = 0;
+#endif
if (ret < 0) {
printk(KERN_ERR "%s: get_index failed\n",
__func__);
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/63dbae485b10999eef5e01d7f1ebcf040918995b
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
