diff --git a/[refs] b/[refs]
index 75054e241b04..e1fbcea9d49b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ca27379f3673b40edbd2fec53b93c993fdb4f0c
+refs/heads/master: d8b2996607d492ffa99628bafc80da14d3a5482d
diff --git a/trunk/drivers/media/video/v4l2-common.c b/trunk/drivers/media/video/v4l2-common.c
index 1ebbe738019f..b91d66a767d7 100644
--- a/trunk/drivers/media/video/v4l2-common.c
+++ b/trunk/drivers/media/video/v4l2-common.c
@@ -1021,6 +1021,8 @@ const unsigned short *v4l2_i2c_tuner_addrs(enum v4l2_i2c_tuner_type type)
 }
 EXPORT_SYMBOL_GPL(v4l2_i2c_tuner_addrs);
 
+#endif /* defined(CONFIG_I2C) */
+
 /* Clamp x to be between min and max, aligned to a multiple of 2^align.  min
  * and max don't have to be aligned, but there must be at least one valid
  * value.  E.g., min=17,max=31,align=4 is not allowed as there are no multiples
@@ -1094,4 +1096,3 @@ void v4l_bound_align_image(u32 *w, unsigned int wmin, unsigned int wmax,
 	}
 }
 EXPORT_SYMBOL_GPL(v4l_bound_align_image);
-#endif /* defined(CONFIG_I2C) */