diff options
author | Michael Krufky <mkrufky@m1k.net> | 2006-01-09 12:32:31 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2006-01-09 12:32:31 -0500 |
commit | 5e453dc757385ec892a818e4e3b5de027987ced9 (patch) | |
tree | c6e5c4ffeb7557c6f3861f39cb4d28532dc3fe39 /drivers/media/video/saa7134/saa7134-video.c | |
parent | 37bdfa06b6bbf085b55d64eb5d9ed112418ed5ad (diff) |
V4L/DVB (3269): ioctls cleanups.
- Now, all internal ioctls are at v4l2-common.h
- removed unused ioctl at saa6752hs.h
- all debug ioctl code moved to v4l2-common.c
- removed duplicated stuff from other cards
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-video.c')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-video.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c index 9b9e1e7f05ef..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 | { |