---

yaml --- r: 11435 b: refs/heads/master c: 564ee7a h: refs/heads/master i: 11433: b2c5094 11431: aadd1bc v: v3
git-mirror · Sep 21, 2005 · de77c6f · de77c6f
1 parent bb2e8fb
commit de77c6f
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 347 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17b1dc07aebdef9ee43c06525bee702d5f0e9db1
+refs/heads/master: 564ee7a5668e8b6d3b369fd807c75c77285c88d4
diff --git a/trunk/arch/ppc/kernel/vecemu.c → trunk/arch/powerpc/kernel/vecemu.c b/trunk/arch/ppc/kernel/vecemu.c → trunk/arch/powerpc/kernel/vecemu.c
diff --git a/trunk/arch/ppc/kernel/Makefile b/trunk/arch/ppc/kernel/Makefile
@@ -36,3 +36,5 @@ ifndef CONFIG_MATH_EMULATION
 obj-$(CONFIG_8xx)		+= softemu8xx.o
 endif
 
+# These are here while we do the architecture merge
+vecemu-y			+= ../../powerpc/kernel/vecemu.o
diff --git a/trunk/arch/ppc64/kernel/Makefile b/trunk/arch/ppc64/kernel/Makefile
@@ -83,3 +83,6 @@ ifeq ($(CONFIG_PPC_ISERIES),y)
 arch/ppc64/kernel/head.o: arch/ppc64/kernel/lparmap.s
 AFLAGS_head.o += -Iarch/ppc64/kernel
 endif
+
+# These are here while we do the architecture merge
+vecemu-y			+= ../../powerpc/kernel/vecemu.o
diff --git a/trunk/arch/ppc64/kernel/vecemu.c b/trunk/arch/ppc64/kernel/vecemu.c