aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/matrox/matroxfb_maven.c
diff options
context:
space:
mode:
authorIgor Mammedov <niallain@gmail.com>2008-04-28 23:08:21 +0000
committerSteve French <sfrench@us.ibm.com>2008-04-28 23:08:21 +0000
commite9f20d6f03e8df393b001dab6dc5226c2a5daf57 (patch)
tree73e94fa5e4f83576c97e36187b809c5aad2ade30 /drivers/video/matrox/matroxfb_maven.c
parentbf62fd887cab230f5952b611bde25e8e15acb454 (diff)
parente31a94ed371c70855eb30b77c490d6d85dd4da26 (diff)
downloadkernel_samsung_smdk4412-e9f20d6f03e8df393b001dab6dc5226c2a5daf57.zip
kernel_samsung_smdk4412-e9f20d6f03e8df393b001dab6dc5226c2a5daf57.tar.gz
kernel_samsung_smdk4412-e9f20d6f03e8df393b001dab6dc5226c2a5daf57.tar.bz2
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/video/matrox/matroxfb_maven.c')
-rw-r--r--drivers/video/matrox/matroxfb_maven.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/matrox/matroxfb_maven.c b/drivers/video/matrox/matroxfb_maven.c
index 0cd58f8..89da27b 100644
--- 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;