summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2016-08-31 08:49:54 +0100
committerRussell King <rmk+kernel@armlinux.org.uk>2020-10-12 21:53:08 +0100
commit35a2e0b3a0b0b10e061aadae3aec78acd5676d9f (patch)
tree70cba4b0b3cd5a5cd263e65f85b955da46c927b6
parent3f8232a330d3dae36d5f6f2fffc683a323a6ef76 (diff)
ARM: sa1100/nanoengine: move nanoengine header file
Nothing outside arch/arm/mach-sa1100 needs the nanoengine header file, so move it into that directory. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
-rw-r--r--arch/arm/mach-sa1100/nanoengine.c2
-rw-r--r--arch/arm/mach-sa1100/nanoengine.h (renamed from arch/arm/mach-sa1100/include/mach/nanoengine.h)0
-rw-r--r--arch/arm/mach-sa1100/pci-nanoengine.c3
3 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-sa1100/nanoengine.c b/arch/arm/mach-sa1100/nanoengine.c
index f6c9c19c39fb..406acd0165e9 100644
--- a/arch/arm/mach-sa1100/nanoengine.c
+++ b/arch/arm/mach-sa1100/nanoengine.c
@@ -24,10 +24,10 @@
#include <asm/mach/map.h>
#include <mach/hardware.h>
-#include <mach/nanoengine.h>
#include <mach/irqs.h>
#include "generic.h"
+#include "nanoengine.h"
/* Flash bank 0 */
static struct mtd_partition nanoengine_partitions[] = {
diff --git a/arch/arm/mach-sa1100/include/mach/nanoengine.h b/arch/arm/mach-sa1100/nanoengine.h
index 8c9513b03512..8c9513b03512 100644
--- a/arch/arm/mach-sa1100/include/mach/nanoengine.h
+++ b/arch/arm/mach-sa1100/nanoengine.h
diff --git a/arch/arm/mach-sa1100/pci-nanoengine.c b/arch/arm/mach-sa1100/pci-nanoengine.c
index 0791d11ff4d4..f847ad8c1df7 100644
--- a/arch/arm/mach-sa1100/pci-nanoengine.c
+++ b/arch/arm/mach-sa1100/pci-nanoengine.c
@@ -13,9 +13,10 @@
#include <asm/mach/pci.h>
#include <asm/mach-types.h>
-#include <mach/nanoengine.h>
#include <mach/hardware.h>
+#include "nanoengine.h"
+
static void __iomem *nanoengine_pci_map_bus(struct pci_bus *bus,
unsigned int devfn, int where)
{