From ed4d28a334745fc62178afc3a7d8b02a292c6491 Mon Sep 17 00:00:00 2001 From: Jonathan Corbet Date: Mon, 23 Nov 2009 14:29:35 -0300 Subject: [PATCH] --- yaml --- r: 174126 b: refs/heads/master c: f8b0bca1a7ea8479490bcc06835ccbf590ba2c4e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/videobuf-vmalloc.c | 2 +- trunk/include/media/videobuf-vmalloc.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 38f77f75b920..a1d5c78eb92e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f58d7856695b6a3a03a56250c6c591022ac9918f +refs/heads/master: f8b0bca1a7ea8479490bcc06835ccbf590ba2c4e diff --git a/trunk/drivers/media/video/videobuf-vmalloc.c b/trunk/drivers/media/video/videobuf-vmalloc.c index 99d646ed0248..d6e6a28fb6b8 100644 --- a/trunk/drivers/media/video/videobuf-vmalloc.c +++ b/trunk/drivers/media/video/videobuf-vmalloc.c @@ -392,7 +392,7 @@ static struct videobuf_qtype_ops qops = { void videobuf_queue_vmalloc_init(struct videobuf_queue* q, const struct videobuf_queue_ops *ops, - void *dev, + struct device *dev, spinlock_t *irqlock, enum v4l2_buf_type type, enum v4l2_field field, diff --git a/trunk/include/media/videobuf-vmalloc.h b/trunk/include/media/videobuf-vmalloc.h index 1ffdb6624436..4b419a257a7d 100644 --- a/trunk/include/media/videobuf-vmalloc.h +++ b/trunk/include/media/videobuf-vmalloc.h @@ -31,7 +31,7 @@ struct videobuf_vmalloc_memory void videobuf_queue_vmalloc_init(struct videobuf_queue* q, const struct videobuf_queue_ops *ops, - void *dev, + struct device *dev, spinlock_t *irqlock, enum v4l2_buf_type type, enum v4l2_field field,