diff options
| author | Tushar Behera <tushar.behera@linaro.org> | 2013-05-15 12:12:18 +0530 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-05-15 12:33:54 -0700 |
| commit | cd432fc233f4e7aba43b4fe499a4445f0f6ee1c6 (patch) | |
| tree | bfd78aba229f3d26ccea1640d9f35362224d910d | |
| parent | 4d591afac92816892ace872dd68eb23c4545711f (diff) | |
Fix merge error w.r.t. printk
While merging Android tree for v3.10-rc1, these lines got deleted
resulting in a build error.
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
| -rw-r--r-- | kernel/printk.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index a13c094b7f3d..cf63b826e9b3 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -51,6 +51,10 @@ #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 |