Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux...

[linux-2.6] / drivers / media / video / tcm825x.c

diff --git a/drivers/media/video/tcm825x.c b/drivers/media/video/tcm825x.c
index fb895f6684a3cf31851323afa4ef5db03e84c762..6943b447a1bd7f4067e4a6f97a92c9e6d67ef83e 100644 (file)
--- a/drivers/media/video/tcm825x.c
+++ b/drivers/media/video/tcm825x.c
@@ -906,7 +906,7 @@ static int __init tcm825x_init(void)
        rval = i2c_add_driver(&tcm825x_i2c_driver);
        if (rval)
                printk(KERN_INFO "%s: failed registering " TCM825X_NAME "\n",
-                      __FUNCTION__);
+                      __func__);
 
        return rval;
 }