Merge from Linus' tree.

[linux-drm-fsl-dcu.git] / arch / ppc / kernel / Makefile

diff --git a/arch/ppc/kernel/Makefile b/arch/ppc/kernel/Makefile
index b1457a8a9c0f0eff8cf3cf130396076438d8d7e5..ce166e3de53b04b8cbf0ca6a07eff8aebf10604a 100644 (file)
--- a/arch/ppc/kernel/Makefile
+++ b/arch/ppc/kernel/Makefile
@@ -35,3 +35,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