patch-2.4.0-test7 linux/include/asm-arm/arch-sa1100/uncompress.h

Next file: linux/include/asm-arm/arch-shark/keyboard.h
Previous file: linux/include/asm-arm/arch-sa1100/irq.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test6/linux/include/asm-arm/arch-sa1100/uncompress.h linux/include/asm-arm/arch-sa1100/uncompress.h
@@ -9,6 +9,8 @@
 #include "hardware.h"
 #include "serial_reg.h"
 
+#include <asm/mach-types.h>
+
 /* Assabet's Status Control "Register" */
 unsigned long SCR_value;
 
@@ -29,7 +31,7 @@
 			serial_port = (unsigned long *)_Ser3UTCR0;
 		else
 			serial_port = (unsigned long *)_Ser1UTCR0;
-	} else if (machine_is_brutus())
+	} 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())

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)