ARM: OMAP1: Move flash.h from plat to mach

This is only used by omap1. Signed-off-by: Tony Lindgren <tony@atomide.com>
author: Tony Lindgren <tony@atomide.com> 2012-09-20 14:41:37 -0400
committer: Tony Lindgren <tony@atomide.com> 2012-09-20 18:02:47 -0400
commit: 578fad4d16742b281a626a1d1725f2c16c386cf7 (patch)
tree: 44a395330bd7ed33945838d359e1a486ecb56bf3
parent: 6cf4fdae4078785695e6424b8f9a4d58e1a2a368 (diff)
13 files changed, 12 insertions, 12 deletions
diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c
index 63aa634ce29f..4b6de70c47a6 100644
--- a/arch/arm/mach-omap1/board-fsample.c
+++ b/arch/arm/mach-omap1/board-fsample.c
@@ -29,7 +29,7 @@
 #include <plat/tc.h>
 #include <mach/mux.h>
-#include <plat/flash.h>
+#include <mach/flash.h>
 #include <plat/fpga.h>
 #include <linux/platform_data/keypad-omap.h>
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index 093297e50ec7..ec2ebd38c2d3 100644
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -42,7 +42,7 @@
 #include <plat/tc.h>
 #include <plat/irda.h>
 #include <linux/platform_data/keypad-omap.h>
-#include <plat/flash.h>
+#include <mach/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 adc0373299ec..06d11b1ee9c6 100644
--- a/arch/arm/mach-omap1/board-h3.c
+++ b/arch/arm/mach-omap1/board-h3.c
@@ -43,7 +43,7 @@
 #include <plat/tc.h>
 #include <linux/platform_data/keypad-omap.h>
 #include <plat/dma.h>
-#include <plat/flash.h>
+#include <mach/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 04a67230cc94..db5f7d2976e7 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 <plat/flash.h>
+#include <mach/flash.h>
 #include <plat/fpga.h>
 #include <plat/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 3ef0bba65b61..2f1f9b967576 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 <plat/flash.h>
+#include <mach/flash.h>
 #include <mach/mux.h>
 #include <plat/tc.h>
diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c
index b633b386240e..43abbd4344b5 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 <plat/flash.h>
+#include <mach/flash.h>
 #include <mach/mux.h>
 #include <plat/tc.h>
 #include <plat/dma.h>
diff --git a/arch/arm/mach-omap1/board-palmtt.c b/arch/arm/mach-omap1/board-palmtt.c
index 518b94dbeae1..0c83634dc150 100644
--- a/arch/arm/mach-omap1/board-palmtt.c
+++ b/arch/arm/mach-omap1/board-palmtt.c
@@ -34,7 +34,7 @@
 #include <asm/mach/map.h>
 #include <plat/led.h>
-#include <plat/flash.h>
+#include <mach/flash.h>
 #include <mach/mux.h>
 #include <plat/dma.h>
 #include <plat/tc.h>
diff --git a/arch/arm/mach-omap1/board-palmz71.c b/arch/arm/mach-omap1/board-palmz71.c
index f4a615d61f69..38935d83f08d 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 <plat/flash.h>
+#include <mach/flash.h>
 #include <mach/mux.h>
 #include <plat/dma.h>
 #include <plat/tc.h>
diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c
index cc38e36b3764..198b05417bfc 100644
--- a/arch/arm/mach-omap1/board-perseus2.c
+++ b/arch/arm/mach-omap1/board-perseus2.c
@@ -31,7 +31,7 @@
 #include <plat/tc.h>
 #include <mach/mux.h>
 #include <plat/fpga.h>
-#include <plat/flash.h>
+#include <mach/flash.h>
 #include <mach/hardware.h>
diff --git a/arch/arm/mach-omap1/board-sx1.c b/arch/arm/mach-omap1/board-sx1.c
index aef2a428883b..eab9b3b5c38e 100644
--- a/arch/arm/mach-omap1/board-sx1.c
+++ b/arch/arm/mach-omap1/board-sx1.c
@@ -34,7 +34,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
-#include <plat/flash.h>
+#include <mach/flash.h>
 #include <mach/mux.h>
 #include <plat/dma.h>
 #include <plat/irda.h>
diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c
index 64289ea8902b..ad75e3411d46 100644
--- a/arch/arm/mach-omap1/board-voiceblue.c
+++ b/arch/arm/mach-omap1/board-voiceblue.c
@@ -32,7 +32,7 @@
 #include <asm/mach/map.h>
 #include <mach/board-voiceblue.h>
-#include <plat/flash.h>
+#include <mach/flash.h>
 #include <mach/mux.h>
 #include <plat/tc.h>
diff --git a/arch/arm/mach-omap1/flash.c b/arch/arm/mach-omap1/flash.c
index 401eb3c080c2..73ae6169aa4a 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 <plat/tc.h>
-#include <plat/flash.h>
+#include <mach/flash.h>
 #include <mach/hardware.h>
diff --git a/arch/arm/plat-omap/include/plat/flash.h b/arch/arm/mach-omap1/include/mach/flash.h
index 0d88499b79e9..0d88499b79e9 100644
--- a/arch/arm/plat-omap/include/plat/flash.h
+++ b/arch/arm/mach-omap1/include/mach/flash.h
author	Tony Lindgren <tony@atomide.com>	2012-09-20 14:41:37 -0400
committer	Tony Lindgren <tony@atomide.com>	2012-09-20 18:02:47 -0400
commit	578fad4d16742b281a626a1d1725f2c16c386cf7 (patch)
tree	44a395330bd7ed33945838d359e1a486ecb56bf3
parent	6cf4fdae4078785695e6424b8f9a4d58e1a2a368 (diff)

diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c index 63aa634ce29f..4b6de70c47a6 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 <plat/tc.h>	30	#include <plat/tc.h>
31	#include <mach/mux.h>	31	#include <mach/mux.h>
32	#include <plat/flash.h>	32	#include <mach/flash.h>
33	#include <plat/fpga.h>	33	#include <plat/fpga.h>
34	#include <linux/platform_data/keypad-omap.h>	34	#include <linux/platform_data/keypad-omap.h>
35		35


diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c index 093297e50ec7..ec2ebd38c2d3 100644 --- a/arch/arm/mach-omap1/board-h2.c +++ b/arch/arm/mach-omap1/board-h2.c
@@ -42,7 +42,7 @@
42	#include <plat/tc.h>	42	#include <plat/tc.h>
43	#include <plat/irda.h>	43	#include <plat/irda.h>
44	#include <linux/platform_data/keypad-omap.h>	44	#include <linux/platform_data/keypad-omap.h>
45	#include <plat/flash.h>	45	#include <mach/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 adc0373299ec..06d11b1ee9c6 100644 --- a/arch/arm/mach-omap1/board-h3.c +++ b/arch/arm/mach-omap1/board-h3.c
@@ -43,7 +43,7 @@
43	#include <plat/tc.h>	43	#include <plat/tc.h>
44	#include <linux/platform_data/keypad-omap.h>	44	#include <linux/platform_data/keypad-omap.h>
45	#include <plat/dma.h>	45	#include <plat/dma.h>
46	#include <plat/flash.h>	46	#include <mach/flash.h>
47		47
48	#include <mach/hardware.h>	48	#include <mach/hardware.h>
49	#include <mach/irqs.h>	49	#include <mach/irqs.h>


diff --git a/arch/arm/mach-omap1/board-innovator.c b/arch/arm/mach-omap1/board-innovator.c index 04a67230cc94..db5f7d2976e7 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 <plat/flash.h>	35	#include <mach/flash.h>
36	#include <plat/fpga.h>	36	#include <plat/fpga.h>
37	#include <plat/tc.h>	37	#include <plat/tc.h>
38	#include <linux/platform_data/keypad-omap.h>	38	#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 3ef0bba65b61..2f1f9b967576 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 <plat/flash.h>	49	#include <mach/flash.h>
50	#include <mach/mux.h>	50	#include <mach/mux.h>
51	#include <plat/tc.h>	51	#include <plat/tc.h>
52		52


diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c index b633b386240e..43abbd4344b5 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 <plat/flash.h>	37	#include <mach/flash.h>
38	#include <mach/mux.h>	38	#include <mach/mux.h>
39	#include <plat/tc.h>	39	#include <plat/tc.h>
40	#include <plat/dma.h>	40	#include <plat/dma.h>


diff --git a/arch/arm/mach-omap1/board-palmtt.c b/arch/arm/mach-omap1/board-palmtt.c index 518b94dbeae1..0c83634dc150 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/map.h>	34	#include <asm/mach/map.h>
35		35
36	#include <plat/led.h>	36	#include <plat/led.h>
37	#include <plat/flash.h>	37	#include <mach/flash.h>
38	#include <mach/mux.h>	38	#include <mach/mux.h>
39	#include <plat/dma.h>	39	#include <plat/dma.h>
40	#include <plat/tc.h>	40	#include <plat/tc.h>


diff --git a/arch/arm/mach-omap1/board-palmz71.c b/arch/arm/mach-omap1/board-palmz71.c index f4a615d61f69..38935d83f08d 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 <plat/flash.h>	39	#include <mach/flash.h>
40	#include <mach/mux.h>	40	#include <mach/mux.h>
41	#include <plat/dma.h>	41	#include <plat/dma.h>
42	#include <plat/tc.h>	42	#include <plat/tc.h>


diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c index cc38e36b3764..198b05417bfc 100644 --- a/arch/arm/mach-omap1/board-perseus2.c +++ b/arch/arm/mach-omap1/board-perseus2.c
@@ -31,7 +31,7 @@
31	#include <plat/tc.h>	31	#include <plat/tc.h>
32	#include <mach/mux.h>	32	#include <mach/mux.h>
33	#include <plat/fpga.h>	33	#include <plat/fpga.h>
34	#include <plat/flash.h>	34	#include <mach/flash.h>
35		35
36	#include <mach/hardware.h>	36	#include <mach/hardware.h>
37		37


diff --git a/arch/arm/mach-omap1/board-sx1.c b/arch/arm/mach-omap1/board-sx1.c index aef2a428883b..eab9b3b5c38e 100644 --- a/arch/arm/mach-omap1/board-sx1.c +++ b/arch/arm/mach-omap1/board-sx1.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 <plat/flash.h>	37	#include <mach/flash.h>
38	#include <mach/mux.h>	38	#include <mach/mux.h>
39	#include <plat/dma.h>	39	#include <plat/dma.h>
40	#include <plat/irda.h>	40	#include <plat/irda.h>


diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c index 64289ea8902b..ad75e3411d46 100644 --- a/arch/arm/mach-omap1/board-voiceblue.c +++ b/arch/arm/mach-omap1/board-voiceblue.c
@@ -32,7 +32,7 @@
32	#include <asm/mach/map.h>	32	#include <asm/mach/map.h>
33		33
34	#include <mach/board-voiceblue.h>	34	#include <mach/board-voiceblue.h>
35	#include <plat/flash.h>	35	#include <mach/flash.h>
36	#include <mach/mux.h>	36	#include <mach/mux.h>
37	#include <plat/tc.h>	37	#include <plat/tc.h>
38		38


diff --git a/arch/arm/mach-omap1/flash.c b/arch/arm/mach-omap1/flash.c index 401eb3c080c2..73ae6169aa4a 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 <plat/tc.h>	13	#include <plat/tc.h>
14	#include <plat/flash.h>	14	#include <mach/flash.h>
15		15
16	#include <mach/hardware.h>	16	#include <mach/hardware.h>
17		17


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