diff options
-rw-r--r-- | drivers/media/video/videobuf-core.c | 2 | ||||
-rw-r--r-- | include/media/videobuf-core.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/videobuf-core.c b/drivers/media/video/videobuf-core.c index 5ea635fac23..137a1ff4a14 100644 --- a/drivers/media/video/videobuf-core.c +++ b/drivers/media/video/videobuf-core.c | |||
@@ -120,7 +120,7 @@ int videobuf_iolock(struct videobuf_queue *q, struct videobuf_buffer *vb, | |||
120 | 120 | ||
121 | void videobuf_queue_core_init(struct videobuf_queue *q, | 121 | void videobuf_queue_core_init(struct videobuf_queue *q, |
122 | struct videobuf_queue_ops *ops, | 122 | struct videobuf_queue_ops *ops, |
123 | void *dev, | 123 | struct device *dev, |
124 | spinlock_t *irqlock, | 124 | spinlock_t *irqlock, |
125 | enum v4l2_buf_type type, | 125 | enum v4l2_buf_type type, |
126 | enum v4l2_field field, | 126 | enum v4l2_field field, |
diff --git a/include/media/videobuf-core.h b/include/media/videobuf-core.h index 99033945cde..fcdffdd6330 100644 --- a/include/media/videobuf-core.h +++ b/include/media/videobuf-core.h | |||
@@ -151,7 +151,7 @@ struct videobuf_qtype_ops { | |||
151 | struct videobuf_queue { | 151 | struct videobuf_queue { |
152 | struct mutex vb_lock; | 152 | struct mutex vb_lock; |
153 | spinlock_t *irqlock; | 153 | spinlock_t *irqlock; |
154 | void *dev; /* on pci, points to struct pci_dev */ | 154 | struct device *dev; |
155 | 155 | ||
156 | enum v4l2_buf_type type; | 156 | enum v4l2_buf_type type; |
157 | unsigned int inputs; /* for V4L2_BUF_FLAG_INPUT */ | 157 | unsigned int inputs; /* for V4L2_BUF_FLAG_INPUT */ |
@@ -185,7 +185,7 @@ void *videobuf_alloc(struct videobuf_queue* q); | |||
185 | 185 | ||
186 | void videobuf_queue_core_init(struct videobuf_queue *q, | 186 | void videobuf_queue_core_init(struct videobuf_queue *q, |
187 | struct videobuf_queue_ops *ops, | 187 | struct videobuf_queue_ops *ops, |
188 | void *dev, | 188 | struct device *dev, |
189 | spinlock_t *irqlock, | 189 | spinlock_t *irqlock, |
190 | enum v4l2_buf_type type, | 190 | enum v4l2_buf_type type, |
191 | enum v4l2_field field, | 191 | enum v4l2_field field, |