diff --git a/[refs] b/[refs] index 5d605a7050eb..c47a1ca6b033 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d87edf264a1f7d7678015e5a6752cde877434d4b +refs/heads/master: f2a49bc72bd2993356b3640cc105646ae56b10b8 diff --git a/trunk/include/media/v4l2-common.h b/trunk/include/media/v4l2-common.h index ce24a6ad445c..aecc946980a3 100644 --- a/trunk/include/media/v4l2-common.h +++ b/trunk/include/media/v4l2-common.h @@ -173,7 +173,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.