Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[linux-2.6-omap-h63xx.git] / drivers / video / matrox / matroxfb_maven.c

diff --git a/drivers/video/matrox/matroxfb_maven.c b/drivers/video/matrox/matroxfb_maven.c
index 0cd58f84fb464170ada3264bfca5500e1dc634c9..89da27bd5c498147d5308e3258af4f2a96349c7d 100644 (file)
--- a/drivers/video/matrox/matroxfb_maven.c
+++ b/drivers/video/matrox/matroxfb_maven.c
@@ -220,7 +220,7 @@ static int matroxfb_PLL_mavenclock(const struct matrox_pll_features2* pll,
        unsigned int scrlen;
        unsigned int fmax;
 
-       DBG(__FUNCTION__)
+       DBG(__func__)
 
        scrlen = htotal * (vtotal - 1);
        fwant = htotal * vtotal;