diff options
author | John Stultz <john.stultz@linaro.org> | 2013-05-21 10:12:15 -0700 |
---|---|---|
committer | John Stultz <john.stultz@linaro.org> | 2013-05-21 10:12:15 -0700 |
commit | 149891b20608f4cbd062d90fa1aca3b2b19e1066 (patch) | |
tree | d5c5f3da7d5307c0bfdd48523463967ffcaf8760 | |
parent | 15a6affec4449b54afba15ab7edbad0cac2736d3 (diff) | |
parent | 1da455354b4a8ff3bc9c5f66f5a174b13e179ae6 (diff) |
Merge branch 'linaro-fixes/experimental/android-3.9' into linaro-android-3.10-experimental-mergetracking-linaro-android-3.10-llct-20130521.0
Conflicts:
kernel/printk.c
-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 cf63b826e9b3..fa36e1494420 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 @@ -1547,10 +1543,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--; |