ARM: omap1: make headers more local

Some header files are never included outside of a mach-omap1 directory and do not need to be made visible in include/mach, so let's just move them all down one level. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Tony Lindgren <tony@atomide.com>
author: Arnd Bergmann <arnd@arndb.de> 2015-01-30 04:45:33 -0500
committer: Arnd Bergmann <arnd@arndb.de> 2015-12-01 15:52:50 -0500
commit: 100f9638fe7c291641418e33d08ff9a5b77803ac (patch)
tree: 2ea1f8fcbdc2142e8bdfd64be7b7a24a92e7c89c
parent: 4c25c5d2985c1db482cfe59ed9b3a07829a60ba9 (diff)
17 files changed, 15 insertions, 15 deletions
diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c
index a95499ea8706..9fc70978823b 100644
--- a/arch/arm/mach-omap1/board-ams-delta.c
+++ b/arch/arm/mach-omap1/board-ams-delta.c
@@ -41,7 +41,7 @@
 #include <mach/hardware.h>
 #include <mach/ams-delta-fiq.h>
-#include <mach/camera.h>
+#include "camera.h"
 #include <mach/usb.h>
 #include "iomap.h"
diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c
index 0fb51d22c8b5..fad95b74bb65 100644
--- a/arch/arm/mach-omap1/board-fsample.c
+++ b/arch/arm/mach-omap1/board-fsample.c
@@ -29,7 +29,7 @@
 #include <mach/tc.h>
 #include <mach/mux.h>
-#include <mach/flash.h>
+#include "flash.h"
 #include <linux/platform_data/keypad-omap.h>
 #include <mach/hardware.h>
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index 8340d684d8b6..cd146ed0538d 100644
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -42,7 +42,7 @@
 #include <linux/omap-dma.h>
 #include <mach/tc.h>
 #include <linux/platform_data/keypad-omap.h>
-#include <mach/flash.h>
+#include "flash.h"
 #include <mach/hardware.h>
 #include <mach/usb.h>
diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c
index 086ff34e072b..f7c8c63dd532 100644
--- a/arch/arm/mach-omap1/board-h3.c
+++ b/arch/arm/mach-omap1/board-h3.c
@@ -44,7 +44,7 @@
 #include <mach/tc.h>
 #include <linux/platform_data/keypad-omap.h>
 #include <linux/omap-dma.h>
-#include <mach/flash.h>
+#include "flash.h"
 #include <mach/hardware.h>
 #include <mach/irqs.h>
diff --git a/arch/arm/mach-omap1/board-innovator.c b/arch/arm/mach-omap1/board-innovator.c
index ed4e045c2ad8..ae90bd02b3bf 100644
--- a/arch/arm/mach-omap1/board-innovator.c
+++ b/arch/arm/mach-omap1/board-innovator.c
@@ -32,7 +32,7 @@
 #include <asm/mach/map.h>
 #include <mach/mux.h>
-#include <mach/flash.h>
+#include "flash.h"
 #include <mach/tc.h>
 #include <linux/platform_data/keypad-omap.h>
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index 0efd165b8227..209aecb0df68 100644
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -46,7 +46,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
-#include <mach/flash.h>
+#include "flash.h"
 #include <mach/mux.h>
 #include <mach/tc.h>
diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c
index 1142ae431fe0..e5288cda1a6a 100644
--- a/arch/arm/mach-omap1/board-palmte.c
+++ b/arch/arm/mach-omap1/board-palmte.c
@@ -34,7 +34,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
-#include <mach/flash.h>
+#include "flash.h"
 #include <mach/mux.h>
 #include <mach/tc.h>
 #include <linux/omap-dma.h>
diff --git a/arch/arm/mach-omap1/board-palmtt.c b/arch/arm/mach-omap1/board-palmtt.c
index 54a547a96950..d672495f7441 100644
--- a/arch/arm/mach-omap1/board-palmtt.c
+++ b/arch/arm/mach-omap1/board-palmtt.c
@@ -34,7 +34,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
-#include <mach/flash.h>
+#include "flash.h"
 #include <mach/mux.h>
 #include <linux/omap-dma.h>
 #include <mach/tc.h>
diff --git a/arch/arm/mach-omap1/board-palmz71.c b/arch/arm/mach-omap1/board-palmz71.c
index 87ec04ae40dd..aaf741b0aff6 100644
--- a/arch/arm/mach-omap1/board-palmz71.c
+++ b/arch/arm/mach-omap1/board-palmz71.c
@@ -36,7 +36,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
-#include <mach/flash.h>
+#include "flash.h"
 #include <mach/mux.h>
 #include <linux/omap-dma.h>
 #include <mach/tc.h>
diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c
index 3d76f05407f0..150b57ba42bf 100644
--- a/arch/arm/mach-omap1/board-perseus2.c
+++ b/arch/arm/mach-omap1/board-perseus2.c
@@ -30,7 +30,7 @@
 #include <mach/tc.h>
 #include <mach/mux.h>
-#include <mach/flash.h>
+#include "flash.h"
 #include <mach/hardware.h>
diff --git a/arch/arm/mach-omap1/board-sx1-mmc.c b/arch/arm/mach-omap1/board-sx1-mmc.c
index 4fcf19c78a08..a9373570bbb1 100644
--- a/arch/arm/mach-omap1/board-sx1-mmc.c
+++ b/arch/arm/mach-omap1/board-sx1-mmc.c
@@ -16,7 +16,7 @@
 #include <linux/platform_device.h>
 #include <mach/hardware.h>
-#include <mach/board-sx1.h>
+#include "board-sx1.h"
 #include "mmc.h"
diff --git a/arch/arm/mach-omap1/board-sx1.c b/arch/arm/mach-omap1/board-sx1.c
index 939991ea33d5..6c482254b37c 100644
--- a/arch/arm/mach-omap1/board-sx1.c
+++ b/arch/arm/mach-omap1/board-sx1.c
@@ -34,11 +34,11 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
-#include <mach/flash.h>
+#include "flash.h"
 #include <mach/mux.h>
 #include <linux/omap-dma.h>
 #include <mach/tc.h>
-#include <mach/board-sx1.h>
+#include "board-sx1.h"
 #include <mach/hardware.h>
 #include <mach/usb.h>
diff --git a/arch/arm/mach-omap1/include/mach/board-sx1.h b/arch/arm/mach-omap1/board-sx1.h
index 355adbdaae33..355adbdaae33 100644
--- a/arch/arm/mach-omap1/include/mach/board-sx1.h
+++ b/arch/arm/mach-omap1/board-sx1.h
diff --git a/arch/arm/mach-omap1/include/mach/camera.h b/arch/arm/mach-omap1/camera.h
index 847d00f0bb0a..847d00f0bb0a 100644
--- a/arch/arm/mach-omap1/include/mach/camera.h
+++ b/arch/arm/mach-omap1/camera.h
diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
index 325e6030095e..263c07a566cb 100644
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
@@ -25,7 +25,7 @@
 #include <mach/mux.h>
 #include <mach/omap7xx.h>
-#include <mach/camera.h>
+#include "camera.h"
 #include <mach/hardware.h>
 #include "common.h"
diff --git a/arch/arm/mach-omap1/flash.c b/arch/arm/mach-omap1/flash.c
index b3fb531af94e..99cda402e1e2 100644
--- a/arch/arm/mach-omap1/flash.c
+++ b/arch/arm/mach-omap1/flash.c
@@ -11,7 +11,7 @@
 #include <linux/mtd/map.h>
 #include <mach/tc.h>
-#include <mach/flash.h>
+#include "flash.h"
 #include <mach/hardware.h>
diff --git a/arch/arm/mach-omap1/include/mach/flash.h b/arch/arm/mach-omap1/flash.h
index 0d88499b79e9..0d88499b79e9 100644
--- a/arch/arm/mach-omap1/include/mach/flash.h
+++ b/arch/arm/mach-omap1/flash.h
author	Arnd Bergmann <arnd@arndb.de>	2015-01-30 04:45:33 -0500
committer	Arnd Bergmann <arnd@arndb.de>	2015-12-01 15:52:50 -0500
commit	100f9638fe7c291641418e33d08ff9a5b77803ac (patch)
tree	2ea1f8fcbdc2142e8bdfd64be7b7a24a92e7c89c
parent	4c25c5d2985c1db482cfe59ed9b3a07829a60ba9 (diff)

diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c index a95499ea8706..9fc70978823b 100644 --- a/arch/arm/mach-omap1/board-ams-delta.c +++ b/arch/arm/mach-omap1/board-ams-delta.c
@@ -41,7 +41,7 @@
41		41
42	#include <mach/hardware.h>	42	#include <mach/hardware.h>
43	#include <mach/ams-delta-fiq.h>	43	#include <mach/ams-delta-fiq.h>
44	#include <mach/camera.h>	44	#include "camera.h"
45	#include <mach/usb.h>	45	#include <mach/usb.h>
46		46
47	#include "iomap.h"	47	#include "iomap.h"


diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c index 0fb51d22c8b5..fad95b74bb65 100644 --- a/arch/arm/mach-omap1/board-fsample.c +++ b/arch/arm/mach-omap1/board-fsample.c
@@ -29,7 +29,7 @@
29		29
30	#include <mach/tc.h>	30	#include <mach/tc.h>
31	#include <mach/mux.h>	31	#include <mach/mux.h>
32	#include <mach/flash.h>	32	#include "flash.h"
33	#include <linux/platform_data/keypad-omap.h>	33	#include <linux/platform_data/keypad-omap.h>
34		34
35	#include <mach/hardware.h>	35	#include <mach/hardware.h>


diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c index 8340d684d8b6..cd146ed0538d 100644 --- a/arch/arm/mach-omap1/board-h2.c +++ b/arch/arm/mach-omap1/board-h2.c
@@ -42,7 +42,7 @@
42	#include <linux/omap-dma.h>	42	#include <linux/omap-dma.h>
43	#include <mach/tc.h>	43	#include <mach/tc.h>
44	#include <linux/platform_data/keypad-omap.h>	44	#include <linux/platform_data/keypad-omap.h>
45	#include <mach/flash.h>	45	#include "flash.h"
46		46
47	#include <mach/hardware.h>	47	#include <mach/hardware.h>
48	#include <mach/usb.h>	48	#include <mach/usb.h>


diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c index 086ff34e072b..f7c8c63dd532 100644 --- a/arch/arm/mach-omap1/board-h3.c +++ b/arch/arm/mach-omap1/board-h3.c
@@ -44,7 +44,7 @@
44	#include <mach/tc.h>	44	#include <mach/tc.h>
45	#include <linux/platform_data/keypad-omap.h>	45	#include <linux/platform_data/keypad-omap.h>
46	#include <linux/omap-dma.h>	46	#include <linux/omap-dma.h>
47	#include <mach/flash.h>	47	#include "flash.h"
48		48
49	#include <mach/hardware.h>	49	#include <mach/hardware.h>
50	#include <mach/irqs.h>	50	#include <mach/irqs.h>


diff --git a/arch/arm/mach-omap1/board-innovator.c b/arch/arm/mach-omap1/board-innovator.c index ed4e045c2ad8..ae90bd02b3bf 100644 --- a/arch/arm/mach-omap1/board-innovator.c +++ b/arch/arm/mach-omap1/board-innovator.c
@@ -32,7 +32,7 @@
32	#include <asm/mach/map.h>	32	#include <asm/mach/map.h>
33		33
34	#include <mach/mux.h>	34	#include <mach/mux.h>
35	#include <mach/flash.h>	35	#include "flash.h"
36	#include <mach/tc.h>	36	#include <mach/tc.h>
37	#include <linux/platform_data/keypad-omap.h>	37	#include <linux/platform_data/keypad-omap.h>
38		38


diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c index 0efd165b8227..209aecb0df68 100644 --- a/arch/arm/mach-omap1/board-osk.c +++ b/arch/arm/mach-omap1/board-osk.c
@@ -46,7 +46,7 @@
46	#include <asm/mach/arch.h>	46	#include <asm/mach/arch.h>
47	#include <asm/mach/map.h>	47	#include <asm/mach/map.h>
48		48
49	#include <mach/flash.h>	49	#include "flash.h"
50	#include <mach/mux.h>	50	#include <mach/mux.h>
51	#include <mach/tc.h>	51	#include <mach/tc.h>
52		52


diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c index 1142ae431fe0..e5288cda1a6a 100644 --- a/arch/arm/mach-omap1/board-palmte.c +++ b/arch/arm/mach-omap1/board-palmte.c
@@ -34,7 +34,7 @@
34	#include <asm/mach/arch.h>	34	#include <asm/mach/arch.h>
35	#include <asm/mach/map.h>	35	#include <asm/mach/map.h>
36		36
37	#include <mach/flash.h>	37	#include "flash.h"
38	#include <mach/mux.h>	38	#include <mach/mux.h>
39	#include <mach/tc.h>	39	#include <mach/tc.h>
40	#include <linux/omap-dma.h>	40	#include <linux/omap-dma.h>


diff --git a/arch/arm/mach-omap1/board-palmtt.c b/arch/arm/mach-omap1/board-palmtt.c index 54a547a96950..d672495f7441 100644 --- a/arch/arm/mach-omap1/board-palmtt.c +++ b/arch/arm/mach-omap1/board-palmtt.c
@@ -34,7 +34,7 @@
34	#include <asm/mach/arch.h>	34	#include <asm/mach/arch.h>
35	#include <asm/mach/map.h>	35	#include <asm/mach/map.h>
36		36
37	#include <mach/flash.h>	37	#include "flash.h"
38	#include <mach/mux.h>	38	#include <mach/mux.h>
39	#include <linux/omap-dma.h>	39	#include <linux/omap-dma.h>
40	#include <mach/tc.h>	40	#include <mach/tc.h>


diff --git a/arch/arm/mach-omap1/board-palmz71.c b/arch/arm/mach-omap1/board-palmz71.c index 87ec04ae40dd..aaf741b0aff6 100644 --- a/arch/arm/mach-omap1/board-palmz71.c +++ b/arch/arm/mach-omap1/board-palmz71.c
@@ -36,7 +36,7 @@
36	#include <asm/mach/arch.h>	36	#include <asm/mach/arch.h>
37	#include <asm/mach/map.h>	37	#include <asm/mach/map.h>
38		38
39	#include <mach/flash.h>	39	#include "flash.h"
40	#include <mach/mux.h>	40	#include <mach/mux.h>
41	#include <linux/omap-dma.h>	41	#include <linux/omap-dma.h>
42	#include <mach/tc.h>	42	#include <mach/tc.h>


diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c index 3d76f05407f0..150b57ba42bf 100644 --- a/arch/arm/mach-omap1/board-perseus2.c +++ b/arch/arm/mach-omap1/board-perseus2.c
@@ -30,7 +30,7 @@
30		30
31	#include <mach/tc.h>	31	#include <mach/tc.h>
32	#include <mach/mux.h>	32	#include <mach/mux.h>
33	#include <mach/flash.h>	33	#include "flash.h"
34		34
35	#include <mach/hardware.h>	35	#include <mach/hardware.h>
36		36


diff --git a/arch/arm/mach-omap1/board-sx1-mmc.c b/arch/arm/mach-omap1/board-sx1-mmc.c index 4fcf19c78a08..a9373570bbb1 100644 --- a/arch/arm/mach-omap1/board-sx1-mmc.c +++ b/arch/arm/mach-omap1/board-sx1-mmc.c
@@ -16,7 +16,7 @@
16	#include <linux/platform_device.h>	16	#include <linux/platform_device.h>
17		17
18	#include <mach/hardware.h>	18	#include <mach/hardware.h>
19	#include <mach/board-sx1.h>	19	#include "board-sx1.h"
20		20
21	#include "mmc.h"	21	#include "mmc.h"
22		22


diff --git a/arch/arm/mach-omap1/board-sx1.c b/arch/arm/mach-omap1/board-sx1.c index 939991ea33d5..6c482254b37c 100644 --- a/arch/arm/mach-omap1/board-sx1.c +++ b/arch/arm/mach-omap1/board-sx1.c
@@ -34,11 +34,11 @@
34	#include <asm/mach/arch.h>	34	#include <asm/mach/arch.h>
35	#include <asm/mach/map.h>	35	#include <asm/mach/map.h>
36		36
37	#include <mach/flash.h>	37	#include "flash.h"
38	#include <mach/mux.h>	38	#include <mach/mux.h>
39	#include <linux/omap-dma.h>	39	#include <linux/omap-dma.h>
40	#include <mach/tc.h>	40	#include <mach/tc.h>
41	#include <mach/board-sx1.h>	41	#include "board-sx1.h"
42		42
43	#include <mach/hardware.h>	43	#include <mach/hardware.h>
44	#include <mach/usb.h>	44	#include <mach/usb.h>


diff --git a/arch/arm/mach-omap1/include/mach/board-sx1.h b/arch/arm/mach-omap1/board-sx1.h index 355adbdaae33..355adbdaae33 100644 --- a/arch/arm/mach-omap1/include/mach/board-sx1.h +++ b/arch/arm/mach-omap1/board-sx1.h


diff --git a/arch/arm/mach-omap1/include/mach/camera.h b/arch/arm/mach-omap1/camera.h index 847d00f0bb0a..847d00f0bb0a 100644 --- a/arch/arm/mach-omap1/include/mach/camera.h +++ b/arch/arm/mach-omap1/camera.h


diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c index 325e6030095e..263c07a566cb 100644 --- a/arch/arm/mach-omap1/devices.c +++ b/arch/arm/mach-omap1/devices.c
@@ -25,7 +25,7 @@
25	#include <mach/mux.h>	25	#include <mach/mux.h>
26		26
27	#include <mach/omap7xx.h>	27	#include <mach/omap7xx.h>
28	#include <mach/camera.h>	28	#include "camera.h"
29	#include <mach/hardware.h>	29	#include <mach/hardware.h>
30		30
31	#include "common.h"	31	#include "common.h"


diff --git a/arch/arm/mach-omap1/flash.c b/arch/arm/mach-omap1/flash.c index b3fb531af94e..99cda402e1e2 100644 --- a/arch/arm/mach-omap1/flash.c +++ b/arch/arm/mach-omap1/flash.c
@@ -11,7 +11,7 @@
11	#include <linux/mtd/map.h>	11	#include <linux/mtd/map.h>
12		12
13	#include <mach/tc.h>	13	#include <mach/tc.h>
14	#include <mach/flash.h>	14	#include "flash.h"
15		15
16	#include <mach/hardware.h>	16	#include <mach/hardware.h>
17		17


diff --git a/arch/arm/mach-omap1/include/mach/flash.h b/arch/arm/mach-omap1/flash.h index 0d88499b79e9..0d88499b79e9 100644 --- a/arch/arm/mach-omap1/include/mach/flash.h +++ b/arch/arm/mach-omap1/flash.h