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

Commit f63e115f authored Jul 03, 2006 by Benjamin Herrenschmidt Committed by Paul Mackerras Jul 03, 2006

[POWERPC] Copy i8259 code back to arch/ppc

This copies the i8259 interrupt controller driver from arch/powerpc
to arch/ppc. It's currently shared by both architectures, but the upcoming
arch/powerpc interrupt changes will break the arch/ppc builds. The changes
are too important to just use #ifdef's in the driver.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

parent cc9fd71c

arch/powerpc/sysdev/Makefile

+4 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,6 @@ endif

		obj-$(CONFIG_MPIC) += mpic.o
		obj-$(CONFIG_PPC_INDIRECT_PCI) += indirect_pci.o
		obj-$(CONFIG_PPC_I8259) += i8259.o
		obj-$(CONFIG_PPC_MPC106) += grackle.o
		obj-$(CONFIG_BOOKE) += dcr.o
		obj-$(CONFIG_40x) += dcr.o
		@@ -14,3 +13,7 @@ obj-$(CONFIG_PPC_83xx) += ipic.o
		obj-$(CONFIG_FSL_SOC) += fsl_soc.o
		obj-$(CONFIG_PPC_TODC) += todc.o
		obj-$(CONFIG_TSI108_BRIDGE) += tsi108_pci.o tsi108_dev.o

		ifeq ($(CONFIG_PPC_MERGE),y)
		obj-$(CONFIG_PPC_I8259) += i8259.o
		endif

arch/ppc/syslib/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -104,3 +104,5 @@ obj-$(CONFIG_PPC_MPC52xx) += mpc52xx_setup.o mpc52xx_pic.o \
		ifeq ($(CONFIG_PPC_MPC52xx),y)
		obj-$(CONFIG_PCI) += mpc52xx_pci.o
		endif

		obj-$(CONFIG_PPC_I8259) += i8259.o