diff -urN linux-2.4.0-test6-rmk5-np2.org/arch/arm/boot/compressed/setup-sa1100.S linux-2.4.0-test6-rmk5-np2-serial/arch/arm/boot/compressed/setup-sa1100.S
--- linux-2.4.0-test6-rmk5-np2.org/arch/arm/boot/compressed/setup-sa1100.S	Wed Aug 30 17:51:30 2000
+++ linux-2.4.0-test6-rmk5-np2-serial/arch/arm/boot/compressed/setup-sa1100.S	Wed Aug 30 18:14:50 2000
@@ -100,7 +100,7 @@
 		@ UART3 if Assabet is used with Neponset
 		teq	r3, #25			@ if Assabet 
 		tsteq	r2, #(1 << 9)		@ ... and Neponset present
-		ldreq	r0, UART3_BASE
+		ldreq	r0, UART1_BASE
 		beq	uart_init
 
 		@ At least for Brutus, the UART1 is used through
@@ -139,7 +139,6 @@
 		mov	r1, #0xff		@ flush status reg
 		str	r1, [r0, #UTSR0]
 skip_uart:
-
 		@ Extra specific setup calls
 		@ The machine type is passed in r0
 		mov	r0, r3
diff -urN linux-2.4.0-test6-rmk5-np2.org/drivers/char/serial_sa1100.c linux-2.4.0-test6-rmk5-np2-serial/drivers/char/serial_sa1100.c
--- linux-2.4.0-test6-rmk5-np2.org/drivers/char/serial_sa1100.c	Wed Aug 30 17:51:30 2000
+++ linux-2.4.0-test6-rmk5-np2-serial/drivers/char/serial_sa1100.c	Wed Aug 30 18:22:58 2000
@@ -1789,8 +1789,9 @@
 		rs_table[1] = SA1100_UART3;
 	} else if( machine_is_assabet() ) {
 		if( !machine_has_neponset() ){
-			rs_table[0] = SA1100_UART1;
-			rs_table[1] = SA1100_UART3;
+				/* Same as assabet */
+			rs_table[0] = SA1100_UART3;
+			rs_table[1] = SA1100_UART1;
 		}else{
 			rs_table[0] = SA1100_UART3;
 			rs_table[1] = SA1100_UART1;
diff -urN linux-2.4.0-test6-rmk5-np2.org/include/asm-arm/arch-sa1100/uncompress.h linux-2.4.0-test6-rmk5-np2-serial/include/asm-arm/arch-sa1100/uncompress.h
--- linux-2.4.0-test6-rmk5-np2.org/include/asm-arm/arch-sa1100/uncompress.h	Wed Aug 30 17:51:15 2000
+++ linux-2.4.0-test6-rmk5-np2-serial/include/asm-arm/arch-sa1100/uncompress.h	Wed Aug 30 18:07:27 2000
@@ -8,7 +8,6 @@
 
 #include "hardware.h"
 #include "serial_reg.h"
-
 #include <asm/mach-types.h>
 
 /* Assabet's Status Control "Register" */
@@ -26,12 +25,15 @@
 {
 	volatile unsigned long *serial_port;
 
+	serial_port = (unsigned long *)_Ser1UTCR0;
 	if (machine_is_assabet()) {
-		if( machine_has_neponset() )
-			serial_port = (unsigned long *)_Ser3UTCR0;
-		else
+/* Change to Serial port 1 when Neponset attachment
+		  if( machine_has_neponset() )
+			  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())
 		serial_port = (unsigned long *)_Ser1UTCR0;
 	else if (machine_is_empeg() || machine_is_bitsy() ||
 		 machine_is_victor() || machine_is_lart())