Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d85b525e authored by Paul Mackerras's avatar Paul Mackerras
Browse files

ppc64: Use the merged mpic.c 



This means we now compile in arch/powerpc/sysdev for ARCH=ppc64.

Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 374e99d4

arch/ppc64/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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

+1 −2
Original line number Diff line number Diff line
@@ -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

arch/ppc64/kernel/mpic.c

deleted100644 → 0
+0 −887

File deleted.

Preview size limit exceeded, changes collapsed.