tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
[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>
authored by
Benjamin Herrenschmidt
and committed by
Paul Mackerras
f63e115f
cc9fd71c
+6
-1
+4
-1
arch/powerpc/sysdev/Makefile
+4
-1
arch/powerpc/sysdev/Makefile
···
4
4
5
5
obj-$(CONFIG_MPIC) += mpic.o
6
6
obj-$(CONFIG_PPC_INDIRECT_PCI) += indirect_pci.o
7
-
obj-$(CONFIG_PPC_I8259) += i8259.o
8
7
obj-$(CONFIG_PPC_MPC106) += grackle.o
9
8
obj-$(CONFIG_BOOKE) += dcr.o
10
9
obj-$(CONFIG_40x) += dcr.o
···
13
14
obj-$(CONFIG_FSL_SOC) += fsl_soc.o
14
15
obj-$(CONFIG_PPC_TODC) += todc.o
15
16
obj-$(CONFIG_TSI108_BRIDGE) += tsi108_pci.o tsi108_dev.o
17
+
18
+
ifeq ($(CONFIG_PPC_MERGE),y)
19
+
obj-$(CONFIG_PPC_I8259) += i8259.o
20
+
endif