summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-iop32x/irq.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2019-08-09 18:33:21 +0200
committerArnd Bergmann <arnd@arndb.de>2019-08-14 15:36:22 +0200
commita1f487d75c9be17421f1ab10172427dd16e5f56a (patch)
treecbe8f8cd2927564f2e97e8a91f2b166e2c08b5b0 /arch/arm/mach-iop32x/irq.c
parentARM: iop32x: make mach/uncompress.h independent of mach/hardware.h (diff)
downloadlinux-a1f487d75c9be17421f1ab10172427dd16e5f56a.tar.xz
linux-a1f487d75c9be17421f1ab10172427dd16e5f56a.zip
ARM: iop32x: merge everything into mach-iop32x/
Various bits of iop32x are now in their traditional locations in plat-iop, mach-iop/include/mach/ and in include/asm/mach/hardware. As nothing outside of the iop32x mach code references these any more, this can all be moved into one place now. The only remaining things in the include/mach/ directory are now the NR_IRQS definition, the entry-macros.S file and the the decompressor uart access. After the irqchip code has been converted to SPARSE_IRQ and GENERIC_IRQ_MULTI_HANDLER, it can be moved to ARCH_MULTIPLATFORM. Link: https://lore.kernel.org/r/20190809163334.489360-7-arnd@arndb.de Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-iop32x/irq.c')
-rw-r--r--arch/arm/mach-iop32x/irq.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-iop32x/irq.c b/arch/arm/mach-iop32x/irq.c
index 2f5d4ec94f9c..2d48bf1398c1 100644
--- a/arch/arm/mach-iop32x/irq.c
+++ b/arch/arm/mach-iop32x/irq.c
@@ -13,9 +13,10 @@
#include <linux/list.h>
#include <asm/mach/irq.h>
#include <asm/irq.h>
-#include <mach/hardware.h>
#include <asm/mach-types.h>
+#include "hardware.h"
+
static u32 iop32x_mask;
static void intctl_write(u32 val)