diff --git a/[refs] b/[refs]
index cc05312790af..9aabc006e4bf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 56b8df11345452103a75060a44429751ce71ee97
+refs/heads/master: 704fd4a5672a5447a7f177838236eb13232be3c1
diff --git a/trunk/drivers/media/video/cx25840/cx25840-vbi.c b/trunk/drivers/media/video/cx25840/cx25840-vbi.c
index 6cc8bf215e85..48014a254e15 100644
--- a/trunk/drivers/media/video/cx25840/cx25840-vbi.c
+++ b/trunk/drivers/media/video/cx25840/cx25840-vbi.c
@@ -111,6 +111,10 @@ void cx25840_vbi_setup(struct i2c_client *client)
 			uv_lpf=0;
 			comb=0;
 			sc=0x0a425f;
+		} else if (std == V4L2_STD_PAL_Nc) {
+			uv_lpf=1;
+			comb=0x20;
+			sc=556453;
 		} else {
 			uv_lpf=1;
 			comb=0x20;