From 13cc5c3d863d8cd61a10bea470bef19c50730217 Mon Sep 17 00:00:00 2001 From: Gerd Knorr Date: Wed, 25 Aug 2004 15:53:14 +0000 Subject: - merge 2.6.9-rc1 changes (mostly __user stuff). --- linux/include/media/video-buf.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'linux/include/media') diff --git a/linux/include/media/video-buf.h b/linux/include/media/video-buf.h index 17b2ae290..3c17bdf0b 100644 --- a/linux/include/media/video-buf.h +++ b/linux/include/media/video-buf.h @@ -226,10 +226,10 @@ int videobuf_streamoff(struct file *file, struct videobuf_queue *q); int videobuf_read_start(struct file *file, struct videobuf_queue *q); void videobuf_read_stop(struct file *file, struct videobuf_queue *q); ssize_t videobuf_read_stream(struct file *file, struct videobuf_queue *q, - char *data, size_t count, loff_t *ppos, + char __user *data, size_t count, loff_t *ppos, int vbihack); ssize_t videobuf_read_one(struct file *file, struct videobuf_queue *q, - char *data, size_t count, loff_t *ppos); + char __user *data, size_t count, loff_t *ppos); unsigned int videobuf_poll_stream(struct file *file, struct videobuf_queue *q, poll_table *wait); -- cgit v1.2.3