diff --git a/[refs] b/[refs]
index a93aab1d22cd..6f701244fa54 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8eb912c6d2c68426c2c2e0aad4c2bbec2240179
+refs/heads/master: d93356a22014f555ab6f9fbeb697fc73b565841a
diff --git a/trunk/drivers/media/dvb/frontends/cx24116.h b/trunk/drivers/media/dvb/frontends/cx24116.h
index 8dbcec268394..2b09e10872fd 100644
--- a/trunk/drivers/media/dvb/frontends/cx24116.h
+++ b/trunk/drivers/media/dvb/frontends/cx24116.h
@@ -45,7 +45,7 @@ extern struct dvb_frontend* cx24116_attach(const struct cx24116_config* config,
 static inline struct dvb_frontend* cx24116_attach(const struct cx24116_config* config,
 						  struct i2c_adapter* i2c)
 {
-	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);
+	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
 	return NULL;
 }
 #endif // CONFIG_DVB_CX24116