From c13184b4c7d404a4d283e1764e6a39713cd057fc Mon Sep 17 00:00:00 2001
From: Steven Toth <stoth@linuxtv.org>
Date: Thu, 16 Oct 2008 20:20:51 -0300
Subject: [PATCH] --- yaml --- r: 115647 b: refs/heads/master c:
 d93356a22014f555ab6f9fbeb697fc73b565841a h: refs/heads/master i:   115645:
 03f1d1abb69597f55cf5424958d7fbedc45e3207   115643:
 33c805a6992166e85921dc1f9e4f6c98b58217db   115639:
 a0f3d2e2cd7f37cfa1c411107dd4c75e83268146   115631:
 91e3458253a3c508f0121ce94e94ac67ae2a0294   115615:
 4dce3589498656e68ec94945e0b44d06cd7a94a3   115583:
 8990739e688e19b38b792e8eff862916e0dc0541 v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/media/dvb/frontends/cx24116.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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