diff options
| author | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
|---|---|---|
| committer | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
| commit | 651dab4264e4ba0e563f5ff56f748127246e9065 (patch) | |
| tree | 016630974bdcb00fe529b673f96d389e0fd6dc94 /include/video/cyblafb.h | |
| parent | 40b8606253552109815786e5d4b0de98782d31f5 (diff) | |
| parent | 2e532d68a2b3e2aa6b19731501222069735c741c (diff) | |
Merge commit 'linus/master' into merge-linus
Conflicts:
arch/x86/kvm/i8254.c
Diffstat (limited to 'include/video/cyblafb.h')
| -rw-r--r-- | include/video/cyblafb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/video/cyblafb.h b/include/video/cyblafb.h index 717440575380..d3c1d4e2c8e3 100644 --- a/include/video/cyblafb.h +++ b/include/video/cyblafb.h | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | #endif | 4 | #endif |
| 5 | 5 | ||
| 6 | #if CYBLAFB_DEBUG | 6 | #if CYBLAFB_DEBUG |
| 7 | #define debug(f,a...) printk("%s:" f, __FUNCTION__ , ## a); | 7 | #define debug(f,a...) printk("%s:" f, __func__ , ## a); |
| 8 | #else | 8 | #else |
| 9 | #define debug(f,a...) | 9 | #define debug(f,a...) |
| 10 | #endif | 10 | #endif |