diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-02-04 15:48:51 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-02-04 15:48:51 +0100 |
| commit | 22e254480982a45b44b425a25f3262b72da4ed0d (patch) | |
| tree | 83256d0ad6ccdfe0f368283b823b855dc5ad0b2e /include/common.h | |
| parent | db63bd8e10abf033e0a49932e2319a76b0fa9c1b (diff) | |
| parent | a81c6a9f16db267aad65f13ced0e25b91cbca179 (diff) | |
| download | barebox-22e254480982a45b44b425a25f3262b72da4ed0d.tar.gz barebox-22e254480982a45b44b425a25f3262b72da4ed0d.tar.xz | |
Merge branch 'for-next/compile-log-level'
Conflicts:
drivers/usb/host/ehci-hcd.c
Diffstat (limited to 'include/common.h')
| -rw-r--r-- | include/common.h | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/include/common.h b/include/common.h index 2c707f730e..56347df2c4 100644 --- a/include/common.h +++ b/include/common.h @@ -29,6 +29,7 @@ #include <linux/kernel.h> #include <linux/stddef.h> #include <asm/common.h> +#include <printk.h> /* * sanity check. The Linux Kernel defines only one of __LITTLE_ENDIAN and @@ -48,22 +49,6 @@ #error "None of __LITTLE_ENDIAN and __BIG_ENDIAN are defined" #endif -#define pr_info(fmt, arg...) printf(fmt, ##arg) -#define pr_notice(fmt, arg...) printf(fmt, ##arg) -#define pr_err(fmt, arg...) printf(fmt, ##arg) -#define pr_warning(fmt, arg...) printf(fmt, ##arg) -#define pr_crit(fmt, arg...) printf(fmt, ##arg) -#define pr_alert(fmt, arg...) printf(fmt, ##arg) -#define pr_emerg(fmt, arg...) printf(fmt, ##arg) - -#ifdef DEBUG -#define pr_debug(fmt, arg...) printf(fmt, ##arg) -#else -#define pr_debug(fmt, arg...) do {} while(0) -#endif - -#define debug(fmt, arg...) pr_debug(fmt, ##arg) - #define BUG() do { \ printf("BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __FUNCTION__); \ panic("BUG!"); \ |