diff options
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-streams.c')
-rw-r--r-- | drivers/media/video/ivtv/ivtv-streams.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/media/video/ivtv/ivtv-streams.c b/drivers/media/video/ivtv/ivtv-streams.c index f77d764707b2..854a950af78c 100644 --- a/drivers/media/video/ivtv/ivtv-streams.c +++ b/drivers/media/video/ivtv/ivtv-streams.c | |||
@@ -43,24 +43,22 @@ | |||
43 | #include "ivtv-cards.h" | 43 | #include "ivtv-cards.h" |
44 | #include "ivtv-streams.h" | 44 | #include "ivtv-streams.h" |
45 | 45 | ||
46 | static const struct file_operations ivtv_v4l2_enc_fops = { | 46 | static const struct v4l2_file_operations ivtv_v4l2_enc_fops = { |
47 | .owner = THIS_MODULE, | 47 | .owner = THIS_MODULE, |
48 | .read = ivtv_v4l2_read, | 48 | .read = ivtv_v4l2_read, |
49 | .write = ivtv_v4l2_write, | 49 | .write = ivtv_v4l2_write, |
50 | .open = ivtv_v4l2_open, | 50 | .open = ivtv_v4l2_open, |
51 | .unlocked_ioctl = ivtv_v4l2_ioctl, | 51 | .unlocked_ioctl = ivtv_v4l2_ioctl, |
52 | .compat_ioctl = v4l_compat_ioctl32, | ||
53 | .release = ivtv_v4l2_close, | 52 | .release = ivtv_v4l2_close, |
54 | .poll = ivtv_v4l2_enc_poll, | 53 | .poll = ivtv_v4l2_enc_poll, |
55 | }; | 54 | }; |
56 | 55 | ||
57 | static const struct file_operations ivtv_v4l2_dec_fops = { | 56 | static const struct v4l2_file_operations ivtv_v4l2_dec_fops = { |
58 | .owner = THIS_MODULE, | 57 | .owner = THIS_MODULE, |
59 | .read = ivtv_v4l2_read, | 58 | .read = ivtv_v4l2_read, |
60 | .write = ivtv_v4l2_write, | 59 | .write = ivtv_v4l2_write, |
61 | .open = ivtv_v4l2_open, | 60 | .open = ivtv_v4l2_open, |
62 | .unlocked_ioctl = ivtv_v4l2_ioctl, | 61 | .unlocked_ioctl = ivtv_v4l2_ioctl, |
63 | .compat_ioctl = v4l_compat_ioctl32, | ||
64 | .release = ivtv_v4l2_close, | 62 | .release = ivtv_v4l2_close, |
65 | .poll = ivtv_v4l2_dec_poll, | 63 | .poll = ivtv_v4l2_dec_poll, |
66 | }; | 64 | }; |
@@ -78,7 +76,7 @@ static struct { | |||
78 | int num_offset; | 76 | int num_offset; |
79 | int dma, pio; | 77 | int dma, pio; |
80 | enum v4l2_buf_type buf_type; | 78 | enum v4l2_buf_type buf_type; |
81 | const struct file_operations *fops; | 79 | const struct v4l2_file_operations *fops; |
82 | } ivtv_stream_info[] = { | 80 | } ivtv_stream_info[] = { |
83 | { /* IVTV_ENC_STREAM_TYPE_MPG */ | 81 | { /* IVTV_ENC_STREAM_TYPE_MPG */ |
84 | "encoder MPG", | 82 | "encoder MPG", |