diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2006-07-03 19:36:30 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-07-03 19:55:30 +1000 |
| commit | f63e115fb50db39706b955b81e3375ef6bab2268 (patch) | |
| tree | 92e2d42ee02806f9419301f61968968b7ea277e4 /arch/powerpc | |
| parent | cc9fd71c62f542233c412b5fabc1bbe0c4d5ad08 (diff) | |
| download | blackbird-op-linux-f63e115fb50db39706b955b81e3375ef6bab2268.tar.gz blackbird-op-linux-f63e115fb50db39706b955b81e3375ef6bab2268.zip | |
[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>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/sysdev/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile index 054bd8b41ef5..cebfae242602 100644 --- a/arch/powerpc/sysdev/Makefile +++ b/arch/powerpc/sysdev/Makefile @@ -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 |
