diff options
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-video.c')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-video.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c index 45c852df13ed..adfa8fe49a11 100644 --- a/drivers/media/video/saa7134/saa7134-video.c +++ b/drivers/media/video/saa7134/saa7134-video.c | |||
@@ -29,6 +29,7 @@ | |||
29 | 29 | ||
30 | #include "saa7134-reg.h" | 30 | #include "saa7134-reg.h" |
31 | #include "saa7134.h" | 31 | #include "saa7134.h" |
32 | #include <media/v4l2-common.h> | ||
32 | 33 | ||
33 | /* Include V4L1 specific functions. Should be removed soon */ | 34 | /* Include V4L1 specific functions. Should be removed soon */ |
34 | #include <linux/videodev.h> | 35 | #include <linux/videodev.h> |
@@ -1689,7 +1690,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file, | |||
1689 | int err; | 1690 | int err; |
1690 | 1691 | ||
1691 | if (video_debug > 1) | 1692 | if (video_debug > 1) |
1692 | saa7134_print_ioctl(dev->name,cmd); | 1693 | v4l_print_ioctl(dev->name,cmd); |
1693 | 1694 | ||
1694 | switch (cmd) { | 1695 | switch (cmd) { |
1695 | case VIDIOC_S_CTRL: | 1696 | case VIDIOC_S_CTRL: |
@@ -2142,7 +2143,7 @@ static int radio_do_ioctl(struct inode *inode, struct file *file, | |||
2142 | struct saa7134_dev *dev = fh->dev; | 2143 | struct saa7134_dev *dev = fh->dev; |
2143 | 2144 | ||
2144 | if (video_debug > 1) | 2145 | if (video_debug > 1) |
2145 | saa7134_print_ioctl(dev->name,cmd); | 2146 | v4l_print_ioctl(dev->name,cmd); |
2146 | switch (cmd) { | 2147 | switch (cmd) { |
2147 | case VIDIOC_QUERYCAP: | 2148 | case VIDIOC_QUERYCAP: |
2148 | { | 2149 | { |
@@ -2262,6 +2263,7 @@ static struct file_operations video_fops = | |||
2262 | .poll = video_poll, | 2263 | .poll = video_poll, |
2263 | .mmap = video_mmap, | 2264 | .mmap = video_mmap, |
2264 | .ioctl = video_ioctl, | 2265 | .ioctl = video_ioctl, |
2266 | .compat_ioctl = v4l_compat_ioctl32, | ||
2265 | .llseek = no_llseek, | 2267 | .llseek = no_llseek, |
2266 | }; | 2268 | }; |
2267 | 2269 | ||
@@ -2271,6 +2273,7 @@ static struct file_operations radio_fops = | |||
2271 | .open = video_open, | 2273 | .open = video_open, |
2272 | .release = video_release, | 2274 | .release = video_release, |
2273 | .ioctl = radio_ioctl, | 2275 | .ioctl = radio_ioctl, |
2276 | .compat_ioctl = v4l_compat_ioctl32, | ||
2274 | .llseek = no_llseek, | 2277 | .llseek = no_llseek, |
2275 | }; | 2278 | }; |
2276 | 2279 | ||