Update of /cvsroot/gc-linux/linux/arch/ppc/boot/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24768/arch/ppc/boot/common
Modified Files:
util.S
Log Message:
Merge 2.6.10
Index: util.S
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/boot/common/util.S,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- util.S 19 Oct 2004 23:18:39 -0000 1.5
+++ util.S 4 Jan 2005 21:39:01 -0000 1.6
@@ -27,6 +27,7 @@
.text
+#ifdef CONFIG_6xx
.globl disable_6xx_mmu
disable_6xx_mmu:
/* Establish default MSR value, exception prefix 0xFFF.
@@ -121,6 +122,7 @@
sync
isync
blr
+#endif
.globl _setup_L2CR
_setup_L2CR:
|
