diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2008-05-06 16:57:55 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2008-05-06 16:57:55 +0200 |
| commit | 7022b15e2a9f878fd5184586064c63352c3dd225 (patch) | |
| tree | 5365c2f5bc82ae1946636ee8d5cd5d3b7e804f1b /drivers/video/tdfxfb.c | |
| parent | aaad2b0c757f3e6e02552cb0bdcd91a5ec0d6305 (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/video/tdfxfb.c')
| -rw-r--r-- | drivers/video/tdfxfb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/tdfxfb.c b/drivers/video/tdfxfb.c index 71e179ea5f9..ea9f19d2559 100644 --- 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> |