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
/
ppc
/
boot
/
simple
/
head.S
diff --git
a/arch/ppc/boot/simple/head.S
b/arch/ppc/boot/simple/head.S
index
cb95484
..
fb58d4e
100644
(file)
--- a/
arch/ppc/boot/simple/head.S
+++ b/
arch/ppc/boot/simple/head.S
@@
-57,7
+57,7
@@
start_:
isync
#endif
isync
#endif
-#if defined(CONFIG_MBX) || defined(CONFIG_RPX
6
) || defined(CONFIG_PPC_PREP)
+#if defined(CONFIG_MBX) || defined(CONFIG_RPX
8260
) || defined(CONFIG_PPC_PREP)
mr r29,r3 /* On the MBX860, r3 is the board info pointer.
* On the RPXSUPER, r3 points to the NVRAM
* configuration keys.
mr r29,r3 /* On the MBX860, r3 is the board info pointer.
* On the RPXSUPER, r3 points to the NVRAM
* configuration keys.
@@
-129,7
+129,7
@@
haveOF:
mr r3, r29
#endif
mr r3, r29
#endif
-#if defined(CONFIG_MBX) || defined(CONFIG_RPX
6
) || defined(CONFIG_PPC_PREP)
+#if defined(CONFIG_MBX) || defined(CONFIG_RPX
8260
) || defined(CONFIG_PPC_PREP)
mr r4,r29 /* put the board info pointer where the relocate
* routine will find it
*/
mr r4,r29 /* put the board info pointer where the relocate
* routine will find it
*/