diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-04-01 17:58:39 -0400 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-04-01 17:58:39 -0400 |
| commit | f36345ff9a4a77f2cc576a2777b6256d5c8798fa (patch) | |
| tree | 7ae4c607f6baae74060c2e385f744e171fbbf92b /include/linux/kernel.h | |
| parent | 1aacc064e029f0017384e463121b98f06d3a2cc3 (diff) | |
| parent | 8b53ef33d9d8fa5f771ae11cc6a6e7bc0182beec (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index f81d80f47dcb..e720b0da7751 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
| @@ -353,6 +353,8 @@ static inline char *pack_hex_byte(char *buf, u8 byte) | |||
| 353 | printk(KERN_NOTICE pr_fmt(fmt), ##__VA_ARGS__) | 353 | printk(KERN_NOTICE pr_fmt(fmt), ##__VA_ARGS__) |
| 354 | #define pr_info(fmt, ...) \ | 354 | #define pr_info(fmt, ...) \ |
| 355 | printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__) | 355 | printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__) |
| 356 | #define pr_cont(fmt, ...) \ | ||
| 357 | printk(KERN_CONT fmt, ##__VA_ARGS__) | ||
| 356 | 358 | ||
| 357 | /* If you are writing a driver, please use dev_dbg instead */ | 359 | /* If you are writing a driver, please use dev_dbg instead */ |
| 358 | #if defined(DEBUG) | 360 | #if defined(DEBUG) |