diff options
| author | Gerd Knorr <devnull@localhost> | 2004-08-25 15:53:14 +0000 |
|---|---|---|
| committer | Gerd Knorr <devnull@localhost> | 2004-08-25 15:53:14 +0000 |
| commit | 13cc5c3d863d8cd61a10bea470bef19c50730217 (patch) | |
| tree | a88d8189d02769ab095fe1d2d229c9ddbc746c63 /linux/include/media/video-buf.h | |
| parent | 6550ed72a57b714bfb1a718538d1fb5c542aa470 (diff) | |
| download | mediapointer-dvb-s2-13cc5c3d863d8cd61a10bea470bef19c50730217.tar.gz mediapointer-dvb-s2-13cc5c3d863d8cd61a10bea470bef19c50730217.tar.bz2 | |
- merge 2.6.9-rc1 changes (mostly __user stuff).
Diffstat (limited to 'linux/include/media/video-buf.h')
| -rw-r--r-- | linux/include/media/video-buf.h | 4 |
1 files changed, 2 insertions, 2 deletions
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); |