Merge branches 'release', 'acpica', 'bugzilla-10224', 'bugzilla-9772', 'bugzilla...

[linux-2.6-omap-h63xx.git] / drivers / media / video / tea5767.h

diff --git a/drivers/media/video/tea5767.h b/drivers/media/video/tea5767.h
index a44451f6114544ea689afa716cae716d559f47bf..7b547c092e25215bbd81505b8635c7ec907611bc 100644 (file)
--- a/drivers/media/video/tea5767.h
+++ b/drivers/media/video/tea5767.h
@@ -50,7 +50,7 @@ static inline int tea5767_autodetection(struct i2c_adapter* i2c_adap,
                                        u8 i2c_addr)
 {
        printk(KERN_INFO "%s: not probed - driver disabled by Kconfig\n",
-              __FUNCTION__);
+              __func__);
        return -EINVAL;
 }
 
@@ -58,7 +58,7 @@ static inline struct dvb_frontend *tea5767_attach(struct dvb_frontend *fe,
                                                   struct i2c_adapter* i2c_adap,
                                                   u8 i2c_addr)
 {
-       printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);
+       printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
        return NULL;
 }
 #endif