diff --git a/[refs] b/[refs]
index be80bf0c7456..83e2c7d3db1b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6972cc8a35514a518ef9c9f608327851cd2e856
+refs/heads/master: fa9448d9bdbae42bb10545f6fcfc980f38f53aa8
diff --git a/trunk/drivers/media/video/cx23885/altera-ci.h b/trunk/drivers/media/video/cx23885/altera-ci.h
index bf0aa2c9b070..70e4fd69ad9e 100644
--- a/trunk/drivers/media/video/cx23885/altera-ci.h
+++ b/trunk/drivers/media/video/cx23885/altera-ci.h
@@ -68,7 +68,7 @@ static inline int altera_ci_irq(void *dev)
 	return 0;
 }
 
-static int altera_ci_tuner_reset(void *dev, int ci_nr)
+static inline int altera_ci_tuner_reset(void *dev, int ci_nr)
 {
 	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
 	return 0;