diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-06-20 09:08:13 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-06-20 09:08:13 +0200 |
| commit | c6abd61fa863feeae14e4fa1323d949941a72aad (patch) | |
| tree | bd573fedb9b8d3db35a7f9306c137e91c012d0cd /include | |
| parent | 82ccbb8588b92c5f40b99b695361e48655cd2494 (diff) | |
| parent | fa8aa1771027718747e76bc3e3008c1840cf3b19 (diff) | |
| download | barebox-c6abd61fa863feeae14e4fa1323d949941a72aad.tar.gz barebox-c6abd61fa863feeae14e4fa1323d949941a72aad.tar.xz | |
Merge branch 'master' into next
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/barebox-wrapper.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/barebox-wrapper.h b/include/linux/barebox-wrapper.h index 1221a21fb6..1d1f846b2b 100644 --- a/include/linux/barebox-wrapper.h +++ b/include/linux/barebox-wrapper.h @@ -20,6 +20,8 @@ #define printk printf +#define pr_warn pr_warning + #define __init #define MODULE_AUTHOR(x) |