diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-24 06:48:46 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-24 06:48:46 -0400 |
| commit | 8c82a17e9c924c0e9f13e75e4c2f6bca19a4b516 (patch) | |
| tree | d535f46a917e14e90deccb29ad00aac016ad18dd /include/linux/pnp.h | |
| parent | 4ce72a2c063a7fa8e42a9435440ae3364115a58d (diff) | |
| parent | 57f8f7b60db6f1ed2c6918ab9230c4623a9dbe37 (diff) | |
Merge commit 'v2.6.28-rc1' into sched/urgent
Diffstat (limited to 'include/linux/pnp.h')
| -rw-r--r-- | include/linux/pnp.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/include/linux/pnp.h b/include/linux/pnp.h index 53b70fd1d9a5..ca3c88773028 100644 --- a/include/linux/pnp.h +++ b/include/linux/pnp.h | |||
| @@ -485,14 +485,4 @@ static inline void pnp_unregister_driver(struct pnp_driver *drv) { } | |||
| 485 | 485 | ||
| 486 | #endif /* CONFIG_PNP */ | 486 | #endif /* CONFIG_PNP */ |
| 487 | 487 | ||
| 488 | #define pnp_err(format, arg...) printk(KERN_ERR "pnp: " format "\n" , ## arg) | ||
| 489 | #define pnp_info(format, arg...) printk(KERN_INFO "pnp: " format "\n" , ## arg) | ||
| 490 | #define pnp_warn(format, arg...) printk(KERN_WARNING "pnp: " format "\n" , ## arg) | ||
| 491 | |||
| 492 | #ifdef CONFIG_PNP_DEBUG | ||
| 493 | #define pnp_dbg(format, arg...) printk(KERN_DEBUG "pnp: " format "\n" , ## arg) | ||
| 494 | #else | ||
| 495 | #define pnp_dbg(format, arg...) do {} while (0) | ||
| 496 | #endif | ||
| 497 | |||
| 498 | #endif /* _LINUX_PNP_H */ | 488 | #endif /* _LINUX_PNP_H */ |