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 /include/linux | |
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 'include/linux')
-rw-r--r-- | include/linux/video_decoder.h | 2 | ||||
-rw-r--r-- | include/linux/videodev2.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/video_decoder.h b/include/linux/video_decoder.h index 0e9e48b83e3b..121e26da2c18 100644 --- a/include/linux/video_decoder.h +++ b/include/linux/video_decoder.h | |||
@@ -1,6 +1,8 @@ | |||
1 | #ifndef _LINUX_VIDEO_DECODER_H | 1 | #ifndef _LINUX_VIDEO_DECODER_H |
2 | #define _LINUX_VIDEO_DECODER_H | 2 | #define _LINUX_VIDEO_DECODER_H |
3 | 3 | ||
4 | #define HAVE_VIDEO_DECODER 1 | ||
5 | |||
4 | struct video_decoder_capability { /* this name is too long */ | 6 | struct video_decoder_capability { /* this name is too long */ |
5 | __u32 flags; | 7 | __u32 flags; |
6 | #define VIDEO_DECODER_PAL 1 /* can decode PAL signal */ | 8 | #define VIDEO_DECODER_PAL 1 /* can decode PAL signal */ |
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index 6ac7c1f7902f..ce40675324bd 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h | |||
@@ -1116,7 +1116,6 @@ int v4l2_prio_check(struct v4l2_prio_state *global, enum v4l2_priority *local); | |||
1116 | /* names for fancy debug output */ | 1116 | /* names for fancy debug output */ |
1117 | extern char *v4l2_field_names[]; | 1117 | extern char *v4l2_field_names[]; |
1118 | extern char *v4l2_type_names[]; | 1118 | extern char *v4l2_type_names[]; |
1119 | extern char *v4l2_ioctl_names[]; | ||
1120 | 1119 | ||
1121 | /* Compatibility layer interface -- v4l1-compat module */ | 1120 | /* Compatibility layer interface -- v4l1-compat module */ |
1122 | typedef int (*v4l2_kioctl)(struct inode *inode, struct file *file, | 1121 | typedef int (*v4l2_kioctl)(struct inode *inode, struct file *file, |