The patch number 10966 was added via Mauro Carvalho Chehab <[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:
Linux Media Mailing List <[email protected]>
------
From: Mauro Carvalho Chehab <[email protected]>
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
---
linux/drivers/media/dvb/firewire/firedtv-avc.c | 7 ++++++-
linux/drivers/media/radio/radio-aimslab.c | 1 -
linux/drivers/media/radio/radio-aztech.c | 1 -
linux/drivers/media/radio/radio-cadet.c | 1 -
linux/drivers/media/radio/radio-gemtek-pci.c | 1 -
linux/drivers/media/radio/radio-gemtek.c | 1 -
linux/drivers/media/radio/radio-maestro.c | 1 -
linux/drivers/media/radio/radio-maxiradio.c | 1 -
linux/drivers/media/radio/radio-rtrack2.c | 1 -
linux/drivers/media/radio/radio-sf16fmi.c | 1 -
linux/drivers/media/radio/radio-sf16fmr2.c | 1 -
linux/drivers/media/radio/radio-terratec.c | 2 --
linux/drivers/media/radio/radio-trust.c | 1 -
linux/drivers/media/radio/radio-typhoon.c | 1 -
linux/drivers/media/radio/radio-zoltrix.c | 1 -
linux/drivers/media/video/ir-kbd-i2c.c | 2 +-
linux/drivers/media/video/ivtv/ivtv-version.h | 2 +-
linux/drivers/media/video/omap24xxcam.c | 1 -
18 files changed, 8 insertions(+), 19 deletions(-)
diff -r d8f1074f66bc -r 3392722cc5b6
linux/drivers/media/dvb/firewire/firedtv-avc.c
--- a/linux/drivers/media/dvb/firewire/firedtv-avc.c Tue Mar 10 21:16:26
2009 -0300
+++ b/linux/drivers/media/dvb/firewire/firedtv-avc.c Thu Mar 12 04:48:11
2009 -0300
@@ -150,15 +150,20 @@ static void debug_fcp(const u8 *data, si
subunit_type = data[1] >> 3;
subunit_id = data[1] & 7;
op = subunit_type == 0x1e || subunit_id == 5 ? ~0 : data[2];
- printk(KERN_INFO "%ssu=%x.%x l=%d: %-8s - %s\n",
+ printk(KERN_INFO "%ssu=%x.%x l=%zu: %-8s - %s\n",
prefix, subunit_type, subunit_id, length,
debug_fcp_ctype(data[0]),
debug_fcp_opcode(op, data, length));
}
if (avc_debug & AVC_DEBUG_FCP_PAYLOADS)
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 22)
print_hex_dump(KERN_INFO, prefix, DUMP_PREFIX_NONE, 16, 1,
data, length, false);
+#else
+ print_hex_dump(KERN_INFO, prefix, DUMP_PREFIX_NONE, 16, 1,
+ (void *)data, length, false);
+#endif
}
static int __avc_write(struct firedtv *fdtv,
diff -r d8f1074f66bc -r 3392722cc5b6 linux/drivers/media/radio/radio-aimslab.c
--- a/linux/drivers/media/radio/radio-aimslab.c Tue Mar 10 21:16:26 2009 -0300
+++ b/linux/drivers/media/radio/radio-aimslab.c Thu Mar 12 04:48:11 2009 -0300
@@ -35,7 +35,6 @@
#include <linux/videodev2.h> /* kernel radio structs */
#include <linux/version.h> /* for KERNEL_VERSION MACRO */
#include <linux/io.h> /* outb, outb_p */
-#include <linux/uaccess.h> /* copy to/from user */
#include <media/v4l2-device.h>
#include <media/v4l2-ioctl.h>
#include "compat.h"
diff -r d8f1074f66bc -r 3392722cc5b6 linux/drivers/media/radio/radio-aztech.c
--- a/linux/drivers/media/radio/radio-aztech.c Tue Mar 10 21:16:26 2009 -0300
+++ b/linux/drivers/media/radio/radio-aztech.c Thu Mar 12 04:48:11 2009 -0300
@@ -32,7 +32,6 @@
#include <linux/videodev2.h> /* kernel radio structs */
#include <linux/version.h> /* for KERNEL_VERSION MACRO */
#include <linux/io.h> /* outb, outb_p */
-#include <linux/uaccess.h> /* copy to/from user */
#include <media/v4l2-device.h>
#include <media/v4l2-ioctl.h>
#include "compat.h"
diff -r d8f1074f66bc -r 3392722cc5b6 linux/drivers/media/radio/radio-cadet.c
--- a/linux/drivers/media/radio/radio-cadet.c Tue Mar 10 21:16:26 2009 -0300
+++ b/linux/drivers/media/radio/radio-cadet.c Thu Mar 12 04:48:11 2009 -0300
@@ -39,7 +39,6 @@
#include <linux/param.h>
#include <linux/pnp.h>
#include <linux/io.h> /* outb, outb_p */
-#include <linux/uaccess.h> /* copy to/from user */
#include <media/v4l2-device.h>
#include <media/v4l2-ioctl.h>
#include "compat.h"
diff -r d8f1074f66bc -r 3392722cc5b6
linux/drivers/media/radio/radio-gemtek-pci.c
--- a/linux/drivers/media/radio/radio-gemtek-pci.c Tue Mar 10 21:16:26
2009 -0300
+++ b/linux/drivers/media/radio/radio-gemtek-pci.c Thu Mar 12 04:48:11
2009 -0300
@@ -48,7 +48,6 @@
#include <linux/errno.h>
#include <linux/version.h> /* for KERNEL_VERSION MACRO */
#include <linux/io.h>
-#include <linux/uaccess.h>
#include <media/v4l2-device.h>
#include <media/v4l2-ioctl.h>
#include "compat.h"
diff -r d8f1074f66bc -r 3392722cc5b6 linux/drivers/media/radio/radio-gemtek.c
--- a/linux/drivers/media/radio/radio-gemtek.c Tue Mar 10 21:16:26 2009 -0300
+++ b/linux/drivers/media/radio/radio-gemtek.c Thu Mar 12 04:48:11 2009 -0300
@@ -24,7 +24,6 @@
#include <linux/version.h> /* for KERNEL_VERSION MACRO */
#include <linux/mutex.h>
#include <linux/io.h> /* outb, outb_p */
-#include <linux/uaccess.h> /* copy to/from user */
#include <media/v4l2-ioctl.h>
#include <media/v4l2-device.h>
#include "compat.h"
diff -r d8f1074f66bc -r 3392722cc5b6 linux/drivers/media/radio/radio-maestro.c
--- a/linux/drivers/media/radio/radio-maestro.c Tue Mar 10 21:16:26 2009 -0300
+++ b/linux/drivers/media/radio/radio-maestro.c Thu Mar 12 04:48:11 2009 -0300
@@ -26,7 +26,6 @@
#include <linux/pci.h>
#include <linux/videodev2.h>
#include <linux/io.h>
-#include <linux/uaccess.h>
#include <media/v4l2-device.h>
#include <media/v4l2-ioctl.h>
#include "compat.h"
diff -r d8f1074f66bc -r 3392722cc5b6 linux/drivers/media/radio/radio-maxiradio.c
--- a/linux/drivers/media/radio/radio-maxiradio.c Tue Mar 10 21:16:26
2009 -0300
+++ b/linux/drivers/media/radio/radio-maxiradio.c Thu Mar 12 04:48:11
2009 -0300
@@ -42,7 +42,6 @@
#include <linux/videodev2.h>
#include <linux/version.h> /* for KERNEL_VERSION MACRO */
#include <linux/io.h>
-#include <linux/uaccess.h>
#include <media/v4l2-device.h>
#include <media/v4l2-ioctl.h>
#include "compat.h"
diff -r d8f1074f66bc -r 3392722cc5b6 linux/drivers/media/radio/radio-rtrack2.c
--- a/linux/drivers/media/radio/radio-rtrack2.c Tue Mar 10 21:16:26 2009 -0300
+++ b/linux/drivers/media/radio/radio-rtrack2.c Thu Mar 12 04:48:11 2009 -0300
@@ -17,7 +17,6 @@
#include <linux/mutex.h>
#include <linux/version.h> /* for KERNEL_VERSION MACRO */
#include <linux/io.h> /* outb, outb_p */
-#include <linux/uaccess.h> /* copy to/from user */
#include <media/v4l2-device.h>
#include <media/v4l2-ioctl.h>
#include "compat.h"
diff -r d8f1074f66bc -r 3392722cc5b6 linux/drivers/media/radio/radio-sf16fmi.c
--- a/linux/drivers/media/radio/radio-sf16fmi.c Tue Mar 10 21:16:26 2009 -0300
+++ b/linux/drivers/media/radio/radio-sf16fmi.c Thu Mar 12 04:48:11 2009 -0300
@@ -26,7 +26,6 @@
#include <linux/mutex.h>
#include <linux/videodev2.h> /* kernel radio structs */
#include <linux/io.h> /* outb, outb_p */
-#include <linux/uaccess.h> /* copy to/from user */
#include <media/v4l2-device.h>
#include <media/v4l2-ioctl.h>
#include "compat.h"
diff -r d8f1074f66bc -r 3392722cc5b6 linux/drivers/media/radio/radio-sf16fmr2.c
--- a/linux/drivers/media/radio/radio-sf16fmr2.c Tue Mar 10 21:16:26
2009 -0300
+++ b/linux/drivers/media/radio/radio-sf16fmr2.c Thu Mar 12 04:48:11
2009 -0300
@@ -22,7 +22,6 @@
#include <linux/mutex.h>
#include <linux/version.h> /* for KERNEL_VERSION MACRO */
#include <linux/io.h> /* outb, outb_p */
-#include <linux/uaccess.h> /* copy to/from user */
#include <media/v4l2-device.h>
#include <media/v4l2-ioctl.h>
#include "compat.h"
diff -r d8f1074f66bc -r 3392722cc5b6 linux/drivers/media/radio/radio-terratec.c
--- a/linux/drivers/media/radio/radio-terratec.c Tue Mar 10 21:16:26
2009 -0300
+++ b/linux/drivers/media/radio/radio-terratec.c Thu Mar 12 04:48:11
2009 -0300
@@ -27,12 +27,10 @@
#include <linux/module.h> /* Modules */
#include <linux/init.h> /* Initdata */
#include <linux/ioport.h> /* request_region */
-#include <linux/delay.h> /* udelay */
#include <linux/videodev2.h> /* kernel radio structs */
#include <linux/mutex.h>
#include <linux/version.h> /* for KERNEL_VERSION MACRO */
#include <linux/io.h> /* outb, outb_p */
-#include <linux/uaccess.h> /* copy to/from user */
#include <media/v4l2-device.h>
#include <media/v4l2-ioctl.h>
#include "compat.h"
diff -r d8f1074f66bc -r 3392722cc5b6 linux/drivers/media/radio/radio-trust.c
--- a/linux/drivers/media/radio/radio-trust.c Tue Mar 10 21:16:26 2009 -0300
+++ b/linux/drivers/media/radio/radio-trust.c Thu Mar 12 04:48:11 2009 -0300
@@ -22,7 +22,6 @@
#include <linux/version.h> /* for KERNEL_VERSION MACRO */
#include <linux/videodev2.h>
#include <linux/io.h>
-#include <linux/uaccess.h>
#include <media/v4l2-device.h>
#include <media/v4l2-ioctl.h>
#include "compat.h"
diff -r d8f1074f66bc -r 3392722cc5b6 linux/drivers/media/radio/radio-typhoon.c
--- a/linux/drivers/media/radio/radio-typhoon.c Tue Mar 10 21:16:26 2009 -0300
+++ b/linux/drivers/media/radio/radio-typhoon.c Thu Mar 12 04:48:11 2009 -0300
@@ -37,7 +37,6 @@
#include <linux/version.h> /* for KERNEL_VERSION MACRO */
#include <linux/videodev2.h> /* kernel radio structs */
#include <linux/io.h> /* outb, outb_p */
-#include <linux/uaccess.h> /* copy to/from user */
#include <media/v4l2-device.h>
#include <media/v4l2-ioctl.h>
#include "compat.h"
diff -r d8f1074f66bc -r 3392722cc5b6 linux/drivers/media/radio/radio-zoltrix.c
--- a/linux/drivers/media/radio/radio-zoltrix.c Tue Mar 10 21:16:26 2009 -0300
+++ b/linux/drivers/media/radio/radio-zoltrix.c Thu Mar 12 04:48:11 2009 -0300
@@ -37,7 +37,6 @@
#include <linux/mutex.h>
#include <linux/version.h> /* for KERNEL_VERSION MACRO */
#include <linux/io.h> /* outb, outb_p */
-#include <linux/uaccess.h> /* copy to/from user */
#include <media/v4l2-device.h>
#include <media/v4l2-ioctl.h>
#include "compat.h"
diff -r d8f1074f66bc -r 3392722cc5b6 linux/drivers/media/video/ir-kbd-i2c.c
--- a/linux/drivers/media/video/ir-kbd-i2c.c Tue Mar 10 21:16:26 2009 -0300
+++ b/linux/drivers/media/video/ir-kbd-i2c.c Thu Mar 12 04:48:11 2009 -0300
@@ -47,9 +47,9 @@
#include <linux/i2c-id.h>
#include <linux/workqueue.h>
+#include "compat.h"
#include <media/ir-common.h>
#include <media/ir-kbd-i2c.h>
-#include "compat.h"
/* ----------------------------------------------------------------------- */
/* insmod parameters */
diff -r d8f1074f66bc -r 3392722cc5b6
linux/drivers/media/video/ivtv/ivtv-version.h
--- a/linux/drivers/media/video/ivtv/ivtv-version.h Tue Mar 10 21:16:26
2009 -0300
+++ b/linux/drivers/media/video/ivtv/ivtv-version.h Thu Mar 12 04:48:11
2009 -0300
@@ -23,7 +23,7 @@
#define IVTV_DRIVER_NAME "ivtv"
#define IVTV_DRIVER_VERSION_MAJOR 1
#define IVTV_DRIVER_VERSION_MINOR 4
-#define IVTV_DRIVER_VERSION_PATCHLEVEL 0
+#define IVTV_DRIVER_VERSION_PATCHLEVEL 1
#define IVTV_VERSION __stringify(IVTV_DRIVER_VERSION_MAJOR) "."
__stringify(IVTV_DRIVER_VERSION_MINOR) "."
__stringify(IVTV_DRIVER_VERSION_PATCHLEVEL)
#define IVTV_DRIVER_VERSION
KERNEL_VERSION(IVTV_DRIVER_VERSION_MAJOR,IVTV_DRIVER_VERSION_MINOR,IVTV_DRIVER_VERSION_PATCHLEVEL)
diff -r d8f1074f66bc -r 3392722cc5b6 linux/drivers/media/video/omap24xxcam.c
--- a/linux/drivers/media/video/omap24xxcam.c Tue Mar 10 21:16:26 2009 -0300
+++ b/linux/drivers/media/video/omap24xxcam.c Thu Mar 12 04:48:11 2009 -0300
@@ -1665,7 +1665,6 @@ static int omap24xxcam_device_register(s
vfd->parent = cam->dev;
strlcpy(vfd->name, CAM_NAME, sizeof(vfd->name));
- vfd->vfl_type = VID_TYPE_CAPTURE | VID_TYPE_CHROMAKEY;
vfd->fops = &omap24xxcam_fops;
vfd->minor = -1;
vfd->ioctl_ops = &omap24xxcam_ioctl_fops;
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/3392722cc5b687586c4d898b73050ab6e59bf401
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
