git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
boot
/
compressed
/
misc.c
diff --git
a/arch/arm/boot/compressed/misc.c
b/arch/arm/boot/compressed/misc.c
index
e653a6d
..
4657e87
100644
(file)
--- a/
arch/arm/boot/compressed/misc.c
+++ b/
arch/arm/boot/compressed/misc.c
@@
-36,7
+36,7
@@
extern void error(char *x);
#ifdef CONFIG_DEBUG_ICEDCC
-#if
def CONFIG_CPU_V6
+#if
defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K)
static void icedcc_putc(int ch)
{