diff options
author | Gerd Knorr <devnull@localhost> | 2004-10-11 14:53:12 +0000 |
---|---|---|
committer | Gerd Knorr <devnull@localhost> | 2004-10-11 14:53:12 +0000 |
commit | 3de5a0bda8a7e0289857223e3b645c0782aee2b7 (patch) | |
tree | e8d872427c5bcf1f84d7c88a8510f6d08e24e4a9 /linux/include/media/video-buf.h | |
parent | 10a75fb37fbb1ab822371d834328d87a8409ff23 (diff) | |
download | mediapointer-dvb-s2-3de5a0bda8a7e0289857223e3b645c0782aee2b7.tar.gz mediapointer-dvb-s2-3de5a0bda8a7e0289857223e3b645c0782aee2b7.tar.bz2 |
- fix poll/select oops.
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 26fcde3eb..3fd4d7db1 100644 --- a/linux/include/media/video-buf.h +++ b/linux/include/media/video-buf.h @@ -1,5 +1,5 @@ /* - * $Id: video-buf.h,v 1.6 2004/09/23 13:58:19 kraxel Exp $ + * $Id: video-buf.h,v 1.7 2004/10/11 14:53:13 kraxel Exp $ * * generic helper functions for video4linux capture buffers, to handle * memory management and PCI DMA. Right now bttv + saa7134 use it. @@ -233,7 +233,7 @@ ssize_t videobuf_read_stream(void *priv, struct videobuf_queue *q, ssize_t videobuf_read_one(void *priv, struct videobuf_queue *q, char __user *data, size_t count, loff_t *ppos, int nonblocking); -unsigned int videobuf_poll_stream(void *priv, +unsigned int videobuf_poll_stream(struct file *file, void *priv, struct videobuf_queue *q, poll_table *wait); |