summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/pvrusb2
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/pvrusb2')
-rw-r--r--linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c8
-rw-r--r--linux/drivers/media/video/pvrusb2/pvrusb2-io.c4
2 files changed, 12 insertions, 0 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 065ccb0bb..17cb1d5c6 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -2611,7 +2611,11 @@ void pvr2_reset_ctl_endpoints(struct pvr2_hdw *hdw)
#endif /* 0 */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
static void pvr2_ctl_write_complete(struct urb *urb, struct pt_regs *regs)
+#else
+static void pvr2_ctl_write_complete(struct urb *urb)
+#endif
{
struct pvr2_hdw *hdw = urb->context;
hdw->ctl_write_pend_flag = 0;
@@ -2620,7 +2624,11 @@ static void pvr2_ctl_write_complete(struct urb *urb, struct pt_regs *regs)
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
static void pvr2_ctl_read_complete(struct urb *urb, struct pt_regs *regs)
+#else
+static void pvr2_ctl_read_complete(struct urb *urb)
+#endif
{
struct pvr2_hdw *hdw = urb->context;
hdw->ctl_read_pend_flag = 0;
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-io.c b/linux/drivers/media/video/pvrusb2/pvrusb2-io.c
index 7b3b53010..afb378b2a 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-io.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-io.c
@@ -449,7 +449,11 @@ static void pvr2_stream_done(struct pvr2_stream *sp)
} while (0); mutex_unlock(&sp->mutex);
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
static void buffer_complete(struct urb *urb, struct pt_regs *regs)
+#else
+static void buffer_complete(struct urb *urb)
+#endif
{
struct pvr2_buffer *bp = urb->context;
struct pvr2_stream *sp;