aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorAndy Green <andy@openmoko.com>2008-11-19 17:11:13 +0000
committerAndy Green <andy@openmoko.com>2008-11-19 17:11:13 +0000
commit6486fe6d2a0a3946714e25d3189e8b151f46cd70 (patch)
treeef1facdb03688ff7c9aa4294093f954305245af8 /kernel
parentf8cd7a973778fb42ee8af74279932d4739db1f8b (diff)
clean-remove-gta02.h-from-printk-debug.patch
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/printk.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/printk.c b/kernel/printk.c
index e9f03c0f11c..5b75d0efbf0 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -37,7 +37,6 @@
#include <asm/uaccess.h>
#include <asm/plat-s3c24xx/neo1973.h>
-#include <mach/gta02.h>
/*
* Architectures can override it:
@@ -677,7 +676,7 @@ asmlinkage int vprintk(const char *fmt, va_list args)
/* Emit the output into the temporary buffer */
printed_len += vscnprintf(printk_buf + printed_len,
sizeof(printk_buf) - printed_len, fmt, args);
-
+#ifdef CONFIG_MACH_NEO1973_GTA02
/* if you're debugging resume, the normal methods can change resume
* ordering behaviours because their debugging output is synchronous
* (ie, CONFIG_DEBUG_LL). If your problem is an OOPS, this code
@@ -709,7 +708,7 @@ asmlinkage int vprintk(const char *fmt, va_list args)
}
(printk_emergency_debug_spew_send_string)(printk_buf);
}
-
+#endif
/*
* Copy the output into log_buf. If the caller didn't provide
* appropriate log level tags, we insert them here