projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'kvm-updates-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
drivers
/
video
/
tdfxfb.c
diff --git
a/drivers/video/tdfxfb.c
b/drivers/video/tdfxfb.c
index
71e179e
..
ea9f19d
100644
(file)
--- a/
drivers/video/tdfxfb.c
+++ b/
drivers/video/tdfxfb.c
@@
-70,7
+70,7
@@
#include <video/tdfx.h>
-#define DPRINTK(a, b...) pr_debug("fb: %s: " a, __
FUNCTION
__ , ## b)
+#define DPRINTK(a, b...) pr_debug("fb: %s: " a, __
func
__ , ## b)
#ifdef CONFIG_MTRR
#include <asm/mtrr.h>