summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/usbvideo
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/usbvideo')
-rw-r--r--linux/drivers/media/video/usbvideo/konicawc.c4
-rw-r--r--linux/drivers/media/video/usbvideo/quickcam_messenger.c8
-rw-r--r--linux/drivers/media/video/usbvideo/usbvideo.c4
3 files changed, 16 insertions, 0 deletions
diff --git a/linux/drivers/media/video/usbvideo/konicawc.c b/linux/drivers/media/video/usbvideo/konicawc.c
index 8c0e25fde..5ab17aaab 100644
--- a/linux/drivers/media/video/usbvideo/konicawc.c
+++ b/linux/drivers/media/video/usbvideo/konicawc.c
@@ -393,7 +393,11 @@ static void resubmit_urb(struct uvd *uvd, struct urb *urb)
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
static void konicawc_isoc_irq(struct urb *urb, struct pt_regs *regs)
+#else
+static void konicawc_isoc_irq(struct urb *urb)
+#endif
{
struct uvd *uvd = urb->context;
struct konicawc *cam = (struct konicawc *)uvd->user_data;
diff --git a/linux/drivers/media/video/usbvideo/quickcam_messenger.c b/linux/drivers/media/video/usbvideo/quickcam_messenger.c
index 66e750336..95f6b86f0 100644
--- a/linux/drivers/media/video/usbvideo/quickcam_messenger.c
+++ b/linux/drivers/media/video/usbvideo/quickcam_messenger.c
@@ -130,7 +130,11 @@ static void qcm_report_buttonstat(struct qcm *cam)
}
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
static void qcm_int_irq(struct urb *urb, struct pt_regs *regs)
+#else
+static void qcm_int_irq(struct urb *urb)
+#endif
{
int ret;
struct uvd *uvd = urb->context;
@@ -611,7 +615,11 @@ static void resubmit_urb(struct uvd *uvd, struct urb *urb)
err("usb_submit_urb error (%d)", ret);
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
static void qcm_isoc_irq(struct urb *urb, struct pt_regs *regs)
+#else
+static void qcm_isoc_irq(struct urb *urb)
+#endif
{
int len;
struct uvd *uvd = urb->context;
diff --git a/linux/drivers/media/video/usbvideo/usbvideo.c b/linux/drivers/media/video/usbvideo/usbvideo.c
index 4db4569a5..0f839d7de 100644
--- a/linux/drivers/media/video/usbvideo/usbvideo.c
+++ b/linux/drivers/media/video/usbvideo/usbvideo.c
@@ -1680,7 +1680,11 @@ static int usbvideo_CompressIsochronous(struct uvd *uvd, struct urb *urb)
return totlen;
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
static void usbvideo_IsocIrq(struct urb *urb, struct pt_regs *regs)
+#else
+static void usbvideo_IsocIrq(struct urb *urb)
+#endif
{
int i, ret, len;
struct uvd *uvd = urb->context;