diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-22 23:28:43 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-22 23:28:43 -0400 |
| commit | 4dff4e7f6cbcd2722b02dbb394ba87c4e05f8841 (patch) | |
| tree | 2b80f6f9d3b5b1ff4600810c4a30917b2d66b7ab /include | |
| parent | 5f50ef453dcb05115fc98f244b8f10bfacd4b8b7 (diff) | |
| parent | ac88a8f3f7df04774b386ddaf586040adb819b58 (diff) | |
Merge branch 'pnp-debug' into test
Diffstat (limited to 'include')
| -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 be764e514e35..05daecec16c5 100644 --- a/include/linux/pnp.h +++ b/include/linux/pnp.h | |||
| @@ -483,14 +483,4 @@ static inline void pnp_unregister_driver(struct pnp_driver *drv) { } | |||
| 483 | 483 | ||
| 484 | #endif /* CONFIG_PNP */ | 484 | #endif /* CONFIG_PNP */ |
| 485 | 485 | ||
| 486 | #define pnp_err(format, arg...) printk(KERN_ERR "pnp: " format "\n" , ## arg) | ||
| 487 | #define pnp_info(format, arg...) printk(KERN_INFO "pnp: " format "\n" , ## arg) | ||
| 488 | #define pnp_warn(format, arg...) printk(KERN_WARNING "pnp: " format "\n" , ## arg) | ||
| 489 | |||
| 490 | #ifdef CONFIG_PNP_DEBUG | ||
| 491 | #define pnp_dbg(format, arg...) printk(KERN_DEBUG "pnp: " format "\n" , ## arg) | ||
| 492 | #else | ||
| 493 | #define pnp_dbg(format, arg...) do {} while (0) | ||
| 494 | #endif | ||
| 495 | |||
| 496 | #endif /* _LINUX_PNP_H */ | 486 | #endif /* _LINUX_PNP_H */ |