diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-09-02 08:56:35 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-09-02 08:56:35 -0300 |
| commit | b2f8e95b7447058a7d2911c4adefeccd19daa036 (patch) | |
| tree | 6aee52907389fa6243df72133e47ed0bc7ac7c70 /linux/include | |
| parent | 22cae52e1c559233a22ba0d3c26b72678563e0cf (diff) | |
| parent | 8f0e83410026fe17e678322dae788d75fb6cc03d (diff) | |
| download | mediapointer-dvb-s2-b2f8e95b7447058a7d2911c4adefeccd19daa036.tar.gz mediapointer-dvb-s2-b2f8e95b7447058a7d2911c4adefeccd19daa036.tar.bz2 | |
merge: http://linuxtv.org/hg/~tap/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/linux/videodev2.h | 2 | ||||
| -rw-r--r-- | linux/include/media/v4l2-common.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h index a2c663daf..906761fe2 100644 --- a/linux/include/linux/videodev2.h +++ b/linux/include/linux/videodev2.h @@ -1311,7 +1311,7 @@ struct v4l2_streamparm #define VIDIOC_G_PRIORITY _IOR ('V', 67, enum v4l2_priority) #define VIDIOC_S_PRIORITY _IOW ('V', 68, enum v4l2_priority) #if 1 /*KEEP*/ -#define VIDIOC_G_SLICED_VBI_CAP _IOR ('V', 69, struct v4l2_sliced_vbi_cap) +#define VIDIOC_G_SLICED_VBI_CAP _IOWR ('V', 69, struct v4l2_sliced_vbi_cap) #endif #define VIDIOC_LOG_STATUS _IO ('V', 70) #define VIDIOC_G_EXT_CTRLS _IOWR ('V', 71, struct v4l2_ext_controls) diff --git a/linux/include/media/v4l2-common.h b/linux/include/media/v4l2-common.h index b551f43cb..ce7df478d 100644 --- a/linux/include/media/v4l2-common.h +++ b/linux/include/media/v4l2-common.h @@ -179,7 +179,7 @@ enum v4l2_chip_ident { #define VIDIOC_INT_S_STANDBY _IOW('d', 94, u32) /* only implemented if CONFIG_VIDEO_ADV_DEBUG is defined */ -#define VIDIOC_INT_S_REGISTER _IOR ('d', 100, struct v4l2_register) +#define VIDIOC_INT_S_REGISTER _IOW ('d', 100, struct v4l2_register) #define VIDIOC_INT_G_REGISTER _IOWR('d', 101, struct v4l2_register) /* Generic reset command. The argument selects which subsystems to reset. |