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

[linux-2.6] / drivers / video / cfbimgblt.c

diff --git a/drivers/video/cfbimgblt.c b/drivers/video/cfbimgblt.c
index ff3136bd464b76105253e28d2f0042291008d4f3..baed57d3cfff38e53a9ea37fff3b82e943ba77cd 100644 (file)
--- a/drivers/video/cfbimgblt.c
+++ b/drivers/video/cfbimgblt.c
@@ -38,7 +38,7 @@
 #define DEBUG
 
 #ifdef DEBUG
-#define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt,__FUNCTION__,## args)
+#define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt,__func__,## args)
 #else
 #define DPRINTK(fmt, args...)
 #endif