diff options
author | Dave Jones <davej@redhat.com> | 2006-09-05 17:16:33 -0400 |
---|---|---|
committer | Dave Jones <davej@redhat.com> | 2006-09-05 17:16:33 -0400 |
commit | 23e735bc7b0e1d614656881794257b4224efda3a (patch) | |
tree | d9523b531156fedb204e31b4612519b0a7a003e7 /include/linux/kernel.h | |
parent | 3906f4edeef976c081c4e7bd92164d2f59c325ae (diff) | |
parent | c336923b668fdcf0312efbec3b44895d713f4d81 (diff) |
Merge ../linus
Diffstat (limited to 'include/linux/kernel.h')
-rw-r--r-- | include/linux/kernel.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 181c69cad4e3..851aa1bcfc1a 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
@@ -210,6 +210,7 @@ extern enum system_states { | |||
210 | extern void dump_stack(void); | 210 | extern void dump_stack(void); |
211 | 211 | ||
212 | #ifdef DEBUG | 212 | #ifdef DEBUG |
213 | /* If you are writing a driver, please use dev_dbg instead */ | ||
213 | #define pr_debug(fmt,arg...) \ | 214 | #define pr_debug(fmt,arg...) \ |
214 | printk(KERN_DEBUG fmt,##arg) | 215 | printk(KERN_DEBUG fmt,##arg) |
215 | #else | 216 | #else |