diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2019-08-09 18:33:21 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2019-08-14 15:36:22 +0200 |
| commit | a1f487d75c9be17421f1ab10172427dd16e5f56a (patch) | |
| tree | cbe8f8cd2927564f2e97e8a91f2b166e2c08b5b0 /arch/arm/mach-iop32x/iq80321.c | |
| parent | ARM: iop32x: make mach/uncompress.h independent of mach/hardware.h (diff) | |
| download | linux-dev-a1f487d75c9be17421f1ab10172427dd16e5f56a.tar.xz linux-dev-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/iq80321.c')
| -rw-r--r-- | arch/arm/mach-iop32x/iq80321.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-iop32x/iq80321.c b/arch/arm/mach-iop32x/iq80321.c index e12699d1c540..4bd596d6c9c1 100644 --- a/arch/arm/mach-iop32x/iq80321.c +++ b/arch/arm/mach-iop32x/iq80321.c @@ -20,7 +20,6 @@ #include <linux/platform_device.h> #include <linux/io.h> #include <linux/gpio/machine.h> -#include <mach/hardware.h> #include <asm/irq.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> @@ -29,7 +28,9 @@ #include <asm/mach-types.h> #include <asm/page.h> #include <asm/pgtable.h> -#include <mach/time.h> + +#include "hardware.h" +#include "irqs.h" #include "gpio-iop32x.h" /* |