diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:27:27 -0400 | 
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:27:27 -0400 | 
| commit | 499792ec6dc737467e5486527cef95ed7d74fba9 (patch) | |
| tree | b88c4ef9d4491c17f71d26d33e73f05f7c7ea6a0 /include/linux/kernel.h | |
| parent | 421b20b9c44b3fcdc07d6af875dad5ae86fad014 (diff) | |
| parent | d14b50cc60ca465290fcdb3b88e7d5fb684361ed (diff) | |
Merge branch 'upstream-fixes' into upstream
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 | 
