diff options
| author | John Stultz <john.stultz@linaro.org> | 2013-10-17 19:43:30 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-10-17 19:43:30 -0700 |
| commit | 67a2ddd473d91d42686446371faf33683f212844 (patch) | |
| tree | ddc1c5eeed5625439fc0741b627f41e97377e989 /kernel | |
| parent | 19efb81ae70ac3904de458078419616647b0cf31 (diff) | |
| parent | 84bb63eb93e4448e891108195ba0a8f654329779 (diff) | |
Merge branch 'linaro-fixes/android-3.10' into linaro-android-3.12-merge
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/printk.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index 9cb84eb1a9de..8212c1aef125 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -51,10 +51,6 @@ #define CREATE_TRACE_POINTS #include <trace/events/printk.h> -#ifdef CONFIG_DEBUG_LL -extern void printascii(char *); -#endif - /* printk's without a loglevel use this.. */ #define DEFAULT_MESSAGE_LOGLEVEL CONFIG_DEFAULT_MESSAGE_LOGLEVEL @@ -1556,10 +1552,6 @@ asmlinkage int vprintk_emit(int facility, int level, */ text_len = vscnprintf(text, sizeof(textbuf), fmt, args); -#ifdef CONFIG_DEBUG_LL - printascii(text); -#endif - /* mark and strip a trailing newline */ if (text_len && text[text_len-1] == '\n') { text_len--; |