From 3eab8095ef1658f5cd4927a0224b1214329cb348 Mon Sep 17 00:00:00 2001 From: Manuel Lauss Date: Thu, 8 Dec 2011 10:42:16 +0000 Subject: MIPS: Alchemy: merge Au1000 and Au1300-style IRQ controller code. With a generic plat_irq_dispatch (for Alchemy at least) code for both interrupt controller types can coexist in a single kernel image and be autodetected at runtime. Signed-off-by: Manuel Lauss Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2935/ Signed-off-by: Ralf Baechle --- arch/mips/alchemy/common/Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'arch/mips/alchemy/common/Makefile') diff --git a/arch/mips/alchemy/common/Makefile b/arch/mips/alchemy/common/Makefile index d3f5c5137804..407ebc00e661 100644 --- a/arch/mips/alchemy/common/Makefile +++ b/arch/mips/alchemy/common/Makefile @@ -6,10 +6,7 @@ # obj-y += prom.o time.o clocks.o platform.o power.o setup.o \ - sleeper.o dma.o dbdma.o vss.o - -obj-$(CONFIG_ALCHEMY_GPIOINT_AU1000) += irq.o -obj-$(CONFIG_ALCHEMY_GPIOINT_AU1300) += gpioint.o + sleeper.o dma.o dbdma.o vss.o irq.o # optional gpiolib support ifeq ($(CONFIG_ALCHEMY_GPIO_INDIRECT),) -- cgit v1.2.3-59-g8ed1b