Thread (97 messages) 97 messages, 8 authors, 2016-09-14

[PATCH 6/8] ARM: sa1100/nanoengine: move nanoengine header file

From: Russell King <hidden>
Date: 2016-08-30 11:00:51
Subsystem: arm port, the rest · Maintainers: Russell King, Linus Torvalds

Nothing outside arch/arm/mach-sa1100 needs the nanoengine header file,
so move it into that directory.

Signed-off-by: Russell King <redacted>
---
 arch/arm/mach-sa1100/nanoengine.c                    | 2 +-
 arch/arm/mach-sa1100/{include/mach => }/nanoengine.h | 0
 arch/arm/mach-sa1100/pci-nanoengine.c                | 3 ++-
 3 files changed, 3 insertions(+), 2 deletions(-)
 rename arch/arm/mach-sa1100/{include/mach => }/nanoengine.h (100%)
diff --git a/arch/arm/mach-sa1100/nanoengine.c b/arch/arm/mach-sa1100/nanoengine.c
index 4d35258a7b32..51e8ab94cd6d 100644
--- a/arch/arm/mach-sa1100/nanoengine.c
+++ b/arch/arm/mach-sa1100/nanoengine.c
@@ -28,10 +28,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
similarity index 100%
rename from arch/arm/mach-sa1100/include/mach/nanoengine.h
rename to 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 d7ae8d50f6d8..81c5e7f68135 100644
--- a/arch/arm/mach-sa1100/pci-nanoengine.c
+++ b/arch/arm/mach-sa1100/pci-nanoengine.c
@@ -26,9 +26,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)
 {
-- 
2.1.0
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help