summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-03-12 04:48:11 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-12 04:48:11 -0300
commite1feeb2f6e1f46de3a06565b23587ce5a1b3c79b (patch)
treef6583d946ed918be82211997e9259268d577c03a
parent24633f3642291c4afb7f6839f0d7e2c1ea7c2be1 (diff)
parent169802c05f1d866f908365460b89269bf1d48247 (diff)
downloadmediapointer-dvb-s2-e1feeb2f6e1f46de3a06565b23587ce5a1b3c79b.tar.gz
mediapointer-dvb-s2-e1feeb2f6e1f46de3a06565b23587ce5a1b3c79b.tar.bz2
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat
-rw-r--r--linux/drivers/media/dvb/firewire/firedtv-avc.c7
-rw-r--r--linux/drivers/media/radio/radio-aimslab.c1
-rw-r--r--linux/drivers/media/radio/radio-aztech.c1
-rw-r--r--linux/drivers/media/radio/radio-cadet.c1
-rw-r--r--linux/drivers/media/radio/radio-gemtek-pci.c1
-rw-r--r--linux/drivers/media/radio/radio-gemtek.c1
-rw-r--r--linux/drivers/media/radio/radio-maestro.c1
-rw-r--r--linux/drivers/media/radio/radio-maxiradio.c1
-rw-r--r--linux/drivers/media/radio/radio-rtrack2.c1
-rw-r--r--linux/drivers/media/radio/radio-sf16fmi.c1
-rw-r--r--linux/drivers/media/radio/radio-sf16fmr2.c1
-rw-r--r--linux/drivers/media/radio/radio-terratec.c2
-rw-r--r--linux/drivers/media/radio/radio-trust.c1
-rw-r--r--linux/drivers/media/radio/radio-typhoon.c1
-rw-r--r--linux/drivers/media/radio/radio-zoltrix.c1
-rw-r--r--linux/drivers/media/video/ir-kbd-i2c.c2
-rw-r--r--linux/drivers/media/video/ivtv/ivtv-version.h2
-rw-r--r--linux/drivers/media/video/omap24xxcam.c1
18 files changed, 8 insertions, 19 deletions
diff --git a/linux/drivers/media/dvb/firewire/firedtv-avc.c b/linux/drivers/media/dvb/firewire/firedtv-avc.c
index b55d9ccaf..d8dae2599 100644
--- a/linux/drivers/media/dvb/firewire/firedtv-avc.c
+++ b/linux/drivers/media/dvb/firewire/firedtv-avc.c
@@ -150,15 +150,20 @@ static void debug_fcp(const u8 *data, size_t length)
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 --git a/linux/drivers/media/radio/radio-aimslab.c b/linux/drivers/media/radio/radio-aimslab.c
index 7c3a81ad9..29834df05 100644
--- a/linux/drivers/media/radio/radio-aimslab.c
+++ b/linux/drivers/media/radio/radio-aimslab.c
@@ -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 --git a/linux/drivers/media/radio/radio-aztech.c b/linux/drivers/media/radio/radio-aztech.c
index 8826b90a3..6b4081a51 100644
--- a/linux/drivers/media/radio/radio-aztech.c
+++ b/linux/drivers/media/radio/radio-aztech.c
@@ -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 --git a/linux/drivers/media/radio/radio-cadet.c b/linux/drivers/media/radio/radio-cadet.c
index 373a34fde..2fd4aae2e 100644
--- a/linux/drivers/media/radio/radio-cadet.c
+++ b/linux/drivers/media/radio/radio-cadet.c
@@ -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 --git a/linux/drivers/media/radio/radio-gemtek-pci.c b/linux/drivers/media/radio/radio-gemtek-pci.c
index b68e2ba4c..13972c431 100644
--- a/linux/drivers/media/radio/radio-gemtek-pci.c
+++ b/linux/drivers/media/radio/radio-gemtek-pci.c
@@ -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 --git a/linux/drivers/media/radio/radio-gemtek.c b/linux/drivers/media/radio/radio-gemtek.c
index 0cb1cb0a1..d991476e8 100644
--- a/linux/drivers/media/radio/radio-gemtek.c
+++ b/linux/drivers/media/radio/radio-gemtek.c
@@ -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 --git a/linux/drivers/media/radio/radio-maestro.c b/linux/drivers/media/radio/radio-maestro.c
index b35092f30..387bf416b 100644
--- a/linux/drivers/media/radio/radio-maestro.c
+++ b/linux/drivers/media/radio/radio-maestro.c
@@ -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 --git a/linux/drivers/media/radio/radio-maxiradio.c b/linux/drivers/media/radio/radio-maxiradio.c
index fa2c5f1ef..a31ea2f5e 100644
--- a/linux/drivers/media/radio/radio-maxiradio.c
+++ b/linux/drivers/media/radio/radio-maxiradio.c
@@ -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 --git a/linux/drivers/media/radio/radio-rtrack2.c b/linux/drivers/media/radio/radio-rtrack2.c
index 92fae4acd..20153db92 100644
--- a/linux/drivers/media/radio/radio-rtrack2.c
+++ b/linux/drivers/media/radio/radio-rtrack2.c
@@ -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 --git a/linux/drivers/media/radio/radio-sf16fmi.c b/linux/drivers/media/radio/radio-sf16fmi.c
index 392aa27e0..b517b3671 100644
--- a/linux/drivers/media/radio/radio-sf16fmi.c
+++ b/linux/drivers/media/radio/radio-sf16fmi.c
@@ -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 --git a/linux/drivers/media/radio/radio-sf16fmr2.c b/linux/drivers/media/radio/radio-sf16fmr2.c
index 34de92f82..65e303dba 100644
--- a/linux/drivers/media/radio/radio-sf16fmr2.c
+++ b/linux/drivers/media/radio/radio-sf16fmr2.c
@@ -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 --git a/linux/drivers/media/radio/radio-terratec.c b/linux/drivers/media/radio/radio-terratec.c
index 9bb1773ca..0bec5f7e2 100644
--- a/linux/drivers/media/radio/radio-terratec.c
+++ b/linux/drivers/media/radio/radio-terratec.c
@@ -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 --git a/linux/drivers/media/radio/radio-trust.c b/linux/drivers/media/radio/radio-trust.c
index 9d2dcb0a7..8b925adb5 100644
--- a/linux/drivers/media/radio/radio-trust.c
+++ b/linux/drivers/media/radio/radio-trust.c
@@ -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 --git a/linux/drivers/media/radio/radio-typhoon.c b/linux/drivers/media/radio/radio-typhoon.c
index 11e3775ab..98e4ce142 100644
--- a/linux/drivers/media/radio/radio-typhoon.c
+++ b/linux/drivers/media/radio/radio-typhoon.c
@@ -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 --git a/linux/drivers/media/radio/radio-zoltrix.c b/linux/drivers/media/radio/radio-zoltrix.c
index 3662f68da..0ae5f0d19 100644
--- a/linux/drivers/media/radio/radio-zoltrix.c
+++ b/linux/drivers/media/radio/radio-zoltrix.c
@@ -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 --git a/linux/drivers/media/video/ir-kbd-i2c.c b/linux/drivers/media/video/ir-kbd-i2c.c
index a0b78706d..7bae57ad3 100644
--- a/linux/drivers/media/video/ir-kbd-i2c.c
+++ b/linux/drivers/media/video/ir-kbd-i2c.c
@@ -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 --git a/linux/drivers/media/video/ivtv/ivtv-version.h b/linux/drivers/media/video/ivtv/ivtv-version.h
index 8cd753d30..b530dec39 100644
--- a/linux/drivers/media/video/ivtv/ivtv-version.h
+++ b/linux/drivers/media/video/ivtv/ivtv-version.h
@@ -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 --git a/linux/drivers/media/video/omap24xxcam.c b/linux/drivers/media/video/omap24xxcam.c
index 73eb656ac..61f3c83db 100644
--- a/linux/drivers/media/video/omap24xxcam.c
+++ b/linux/drivers/media/video/omap24xxcam.c
@@ -1665,7 +1665,6 @@ static int omap24xxcam_device_register(struct v4l2_int_device *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;
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-06 11:38:23 +0000