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 'viafb-next' of git://github.com/schandinat/linux-2.6 into fbdev-fixes...
[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
4657e87
..
2df3826
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
#ifdef CONFIG_DEBUG_ICEDCC
-#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K)
+#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K)
|| defined(CONFIG_CPU_V7)
static void icedcc_putc(int ch)
{
static void icedcc_putc(int ch)
{
@@
-52,16
+52,6
@@
static void icedcc_putc(int ch)
asm("mcr p14, 0, %0, c0, c5, 0" : : "r" (ch));
}
asm("mcr p14, 0, %0, c0, c5, 0" : : "r" (ch));
}
-#elif defined(CONFIG_CPU_V7)
-
-static void icedcc_putc(int ch)
-{
- asm(
- "wait: mrc p14, 0, pc, c0, c1, 0 \n\
- bcs wait \n\
- mcr p14, 0, %0, c0, c5, 0 "
- : : "r" (ch));
-}
#elif defined(CONFIG_CPU_XSCALE)
#elif defined(CONFIG_CPU_XSCALE)