diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-03-09 20:33:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-03-09 20:33:35 +0000 |
| commit | 116674acc97ba75a720329996877077d988443a2 (patch) | |
| tree | 6a3f2ff0b612ae2ee8a3f3509370c9e6333a53b3 /include/asm-arm/arch-sa1100/uncompress.h | |
| parent | 71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff) | |
Merge with Linux 2.4.2.
Diffstat (limited to 'include/asm-arm/arch-sa1100/uncompress.h')
| -rw-r--r-- | include/asm-arm/arch-sa1100/uncompress.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-arm/arch-sa1100/uncompress.h b/include/asm-arm/arch-sa1100/uncompress.h index 5f4648ee6..f2a46c0d8 100644 --- a/include/asm-arm/arch-sa1100/uncompress.h +++ b/include/asm-arm/arch-sa1100/uncompress.h @@ -31,10 +31,12 @@ static void puts( const char *s ) serial_port = (unsigned long *)_Ser3UTCR0; else serial_port = (unsigned long *)_Ser1UTCR0; - } else if (machine_is_brutus()||machine_is_nanoengine()) + } else if (machine_is_brutus()||machine_is_nanoengine() || + machine_is_pangolin()) serial_port = (unsigned long *)_Ser1UTCR0; else if (machine_is_empeg() || machine_is_bitsy() || - machine_is_victor() || machine_is_lart()) + machine_is_victor() || machine_is_lart() || + machine_is_sherman() ) serial_port = (unsigned long *)_Ser3UTCR0; else return; |