Merge branch 'release-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/ak...

[pandora-kernel.git] / drivers / video / pm2fb.c

diff --git a/drivers/video/pm2fb.c b/drivers/video/pm2fb.c
index 540249f..3f1ca2a 100644 (file)
--- a/drivers/video/pm2fb.c
+++ b/drivers/video/pm2fb.c
@@ -56,7 +56,7 @@
 #undef PM2FB_MASTER_DEBUG
 #ifdef PM2FB_MASTER_DEBUG
 #define DPRINTK(a, b...)       \
-       printk(KERN_DEBUG "pm2fb: %s: " a, __FUNCTION__ , ## b)
+       printk(KERN_DEBUG "pm2fb: %s: " a, __func__ , ## b)
 #else
 #define DPRINTK(a, b...)
 #endif