X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Farm%2Fboot%2Fcompressed%2Fhead-sa1100.S;h=26f7f77cbbccec5ffe7e60aa17bd37e8a6c7bb9f;hb=9bf4aaab3e101692164d49b7ca357651eb691cb6;hp=19ac7bb11ed68e9833b738054cfbc3f986034f0a;hpb=db216c3d5e4c040e557a50f8f5d35d5c415e8c1c;p=linux-2.6.git

diff --git a/arch/arm/boot/compressed/head-sa1100.S b/arch/arm/boot/compressed/head-sa1100.S
index 19ac7bb11..26f7f77cb 100644
--- a/arch/arm/boot/compressed/head-sa1100.S
+++ b/arch/arm/boot/compressed/head-sa1100.S
@@ -30,6 +30,9 @@ __SA1100_start:
 		mov	r8, #0
 #endif
 
+#ifdef CONFIG_SA1100_COLLIE
+		mov	r7, #MACH_TYPE_COLLIE
+#endif
 #ifdef CONFIG_SA1100_PFS168
 		@ REVISIT_PFS168: Temporary until firmware updated to use assigned machine number
 		mov	r7, #MACH_TYPE_PFS168