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

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--;