diff --git a/[refs] b/[refs]
index fe6373f7cb6b..2946a6e9361c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d217b83fe315776d54b11d752fb09c5fb0de2da
+refs/heads/master: fabfd71153c7e98aca77c8069a633f3a25bcdaf7
diff --git a/trunk/drivers/staging/media/go7007/go7007-v4l2.c b/trunk/drivers/staging/media/go7007/go7007-v4l2.c
index e9196bbc21ee..6cb6f43a1aa5 100644
--- a/trunk/drivers/staging/media/go7007/go7007-v4l2.c
+++ b/trunk/drivers/staging/media/go7007/go7007-v4l2.c
@@ -1834,7 +1834,6 @@ static struct video_device go7007_template = {
 	.release	= go7007_vfl_release,
 	.ioctl_ops	= &video_ioctl_ops,
 	.tvnorms	= V4L2_STD_ALL,
-	.current_norm	= V4L2_STD_NTSC,
 };
 
 int go7007_v4l2_init(struct go7007 *go)