git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
include
/
asm-arm
/
arch-ixp4xx
/
uncompress.h
diff --git
a/include/asm-arm/arch-ixp4xx/uncompress.h
b/include/asm-arm/arch-ixp4xx/uncompress.h
index
0535098
..
960c358
100644
(file)
--- a/
include/asm-arm/arch-ixp4xx/uncompress.h
+++ b/
include/asm-arm/arch-ixp4xx/uncompress.h
@@
-46,9
+46,9
@@
static void putstr(const char *s)
static __inline__ void __arch_decomp_setup(unsigned long arch_id)
{
/*
static __inline__ void __arch_decomp_setup(unsigned long arch_id)
{
/*
- * Coyote
only has
UART2 connected
+ * Coyote
and gtwx5715 only have
UART2 connected
*/
*/
- if (machine_is_adi_coyote())
+ if (machine_is_adi_coyote()
|| machine_is_gtwx5715()
)
uart_base = (volatile u32*) IXP4XX_UART2_BASE_PHYS;
else
uart_base = (volatile u32*) IXP4XX_UART1_BASE_PHYS;
uart_base = (volatile u32*) IXP4XX_UART2_BASE_PHYS;
else
uart_base = (volatile u32*) IXP4XX_UART1_BASE_PHYS;