diff --git a/[refs] b/[refs]
index d7275ee65210..bdf195eb4904 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 95736034df751631657140aebe677e67d7522867
+refs/heads/master: 01cb9633e1b294c604c2dfa01dcac95daf775213
diff --git a/trunk/drivers/media/video/tda8290.c b/trunk/drivers/media/video/tda8290.c
index 2aeae864edc7..0dde6af251dd 100644
--- a/trunk/drivers/media/video/tda8290.c
+++ b/trunk/drivers/media/video/tda8290.c
@@ -535,7 +535,7 @@ int tda8290_init(struct i2c_client *c)
 	if (tuner_addrs == 0) {
 		tuner_addrs = 0x61;
 		tuner_info ("could not clearly identify tuner address, defaulting to %x\n",
-		             tuner_addrs);
+			     tuner_addrs);
 	} else {
 		tuner_addrs = tuner_addrs & 0xff;
 		tuner_info ("setting tuner address to %x\n", tuner_addrs);
diff --git a/trunk/include/media/tuner.h b/trunk/include/media/tuner.h
index 8058be63ad0e..5196d9eac442 100644
--- a/trunk/include/media/tuner.h
+++ b/trunk/include/media/tuner.h
@@ -214,6 +214,7 @@ extern int tda8290_init(struct i2c_client *c);
 extern int tea5767_tuner_init(struct i2c_client *c);
 extern int default_tuner_init(struct i2c_client *c);
 extern int tea5767_autodetection(struct i2c_client *c);
+extern int tda8290_probe(struct i2c_client *c);
 
 #define tuner_warn(fmt, arg...) do {\
 	printk(KERN_WARNING "%s %d-%04x: " fmt, t->i2c.driver->name, \