From 3dde3a58123bcaf41d63ed820569c20023cbb839 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Tue, 31 Jul 2012 16:41:34 -0700
Subject: [PATCH] --- yaml --- r: 320753 b: refs/heads/master c:
 c2cddf991974a00aa7b40a21e829bc034b8199b6 h: refs/heads/master i:   320751:
 faf6bc041cd3e313f5d9eebda751bb8395c100b5 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/media/video/v4l2-ioctl.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 011dc5761008..4cc8b844854a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c66af411189fdae3bcb301fae830f078fc205fca
+refs/heads/master: c2cddf991974a00aa7b40a21e829bc034b8199b6
diff --git a/trunk/drivers/media/video/v4l2-ioctl.c b/trunk/drivers/media/video/v4l2-ioctl.c
index 70e0efb127a6..4b4059d64272 100644
--- a/trunk/drivers/media/video/v4l2-ioctl.c
+++ b/trunk/drivers/media/video/v4l2-ioctl.c
@@ -1831,7 +1831,9 @@ struct v4l2_ioctl_info {
 		.ioctl = _ioctl,					\
 		.flags = _flags | INFO_FL_STD,				\
 		.name = #_ioctl,					\
-		.offset = offsetof(struct v4l2_ioctl_ops, _vidioc),	\
+		{							\
+			.offset = offsetof(struct v4l2_ioctl_ops, _vidioc),\
+		},							\
 		.debug = _debug,					\
 	}
 
@@ -1840,7 +1842,9 @@ struct v4l2_ioctl_info {
 		.ioctl = _ioctl,					\
 		.flags = _flags | INFO_FL_FUNC,				\
 		.name = #_ioctl,					\
-		.func = _func,						\
+		{							\
+			.func = _func,					\
+		},							\
 		.debug = _debug,					\
 	}