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.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
arch
/
arm
/
boot
/
compressed
/
head-sa1100.S
diff --git
a/arch/arm/boot/compressed/head-sa1100.S
b/arch/arm/boot/compressed/head-sa1100.S
index
19ac7bb
..
26f7f77
100644
(file)
--- 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