ppc64: Use the merged mpic.c

This means we now compile in arch/powerpc/sysdev for ARCH=ppc64.
Signed-off-by: Paul Mackerras <paulus@samba.org>

arch/ppc64/Makefile

@@ -84,6 +84,7 @@ head-y := arch/ppc64/kernel/head.o
 libs-y				+= arch/ppc64/lib/
 core-y				+= arch/ppc64/kernel/ arch/powerpc/kernel/
 core-y				+= arch/powerpc/mm/
+core-y				+= arch/powerpc/sysdev/
 core-y				+= arch/powerpc/platforms/
 core-$(CONFIG_XMON)		+= arch/ppc64/xmon/
 drivers-$(CONFIG_OPROFILE)	+= arch/powerpc/oprofile/

arch/ppc64/kernel/Makefile

@@ -55,9 +55,8 @@ obj-$(CONFIG_HVCS)		+= hvcserver.o
 
 obj-$(CONFIG_IBMVIO)		+= vio.o
 obj-$(CONFIG_XICS)		+= xics.o
-ifneq ($(CONFIG_PPC_MERGE),y)
-obj-$(CONFIG_MPIC)		+= mpic.o
 
+ifneq ($(CONFIG_PPC_MERGE),y)
 obj-$(CONFIG_PPC_PMAC)		+= pmac_setup.o pmac_feature.o pmac_pci.o \
 				   pmac_time.o pmac_nvram.o pmac_low_i2c.o \
 				   udbg_scc.o