Merge branch 'master' into upstream

[linux-2.6] / include / media / v4l2-common.h

diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
index ce24a6ad445cebf816f67c7d8b595b5c3c0d4a86..aecc946980a3a7da00ce0f7b90fbaf70248bf7a1 100644 (file)
--- a/include/media/v4l2-common.h
+++ b/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.