[PATCH 20/29] ARM: OMAP1: Move flash.h from plat to mach

public inbox for linux-arm-kernel@lists.infradead.org
 help / color / mirror / Atom feed

From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 20/29] ARM: OMAP1: Move flash.h from plat to mach
Date: Wed, 19 Sep 2012 14:06:22 -0700	[thread overview]
Message-ID: <20120919210622.28074.79557.stgit@muffinssi> (raw)
In-Reply-To: <20120919205732.28074.43697.stgit@muffinssi>

This is only used by omap1.

Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 arch/arm/mach-omap1/board-fsample.c      |    2 +-
 arch/arm/mach-omap1/board-h2.c           |    2 +-
 arch/arm/mach-omap1/board-h3.c           |    2 +-
 arch/arm/mach-omap1/board-innovator.c    |    2 +-
 arch/arm/mach-omap1/board-osk.c          |    2 +-
 arch/arm/mach-omap1/board-palmte.c       |    2 +-
 arch/arm/mach-omap1/board-palmtt.c       |    2 +-
 arch/arm/mach-omap1/board-palmz71.c      |    2 +-
 arch/arm/mach-omap1/board-perseus2.c     |    2 +-
 arch/arm/mach-omap1/board-sx1.c          |    2 +-
 arch/arm/mach-omap1/board-voiceblue.c    |    2 +-
 arch/arm/mach-omap1/flash.c              |    2 +-
 arch/arm/mach-omap1/include/mach/flash.h |    0 
 13 files changed, 12 insertions(+), 12 deletions(-)
 rename arch/arm/{plat-omap/include/plat/flash.h => mach-omap1/include/mach/flash.h} (100%)

diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c
index 81c41cc..228e4ca 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 <mach/keypad.h>
 
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index ce99021..166f90c 100644
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -43,7 +43,7 @@
 #include <plat/tc.h>
 #include <plat/irda.h>
 #include <mach/keypad.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 76411dd..6c44bb4 100644
--- a/arch/arm/mach-omap1/board-h3.c
+++ b/arch/arm/mach-omap1/board-h3.c
@@ -44,7 +44,7 @@
 #include <plat/tc.h>
 #include <mach/keypad.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 2469811..3ed0d87 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 <mach/keypad.h>
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index eda3890..8d00068 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 58ef785..cbe17fa 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 7ab487c..5df8672 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 4ce3278..b087ba0 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 deb0b00..3f485ce 100644
--- a/arch/arm/mach-omap1/board-perseus2.c
+++ b/arch/arm/mach-omap1/board-perseus2.c
@@ -30,7 +30,7 @@
 #include <plat/tc.h>
 #include <mach/mux.h>
 #include <plat/fpga.h>
-#include <plat/flash.h>
+#include <mach/flash.h>
 #include <mach/keypad.h>
 
 #include <mach/hardware.h>
diff --git a/arch/arm/mach-omap1/board-sx1.c b/arch/arm/mach-omap1/board-sx1.c
index e5edabf..87637e7 100644
--- a/arch/arm/mach-omap1/board-sx1.c
+++ b/arch/arm/mach-omap1/board-sx1.c
@@ -33,7 +33,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 64289ea..ad75e34 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 401eb3c..73ae616 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
similarity index 100%
rename from arch/arm/plat-omap/include/plat/flash.h
rename to arch/arm/mach-omap1/include/mach/flash.h

next prev parent reply	other threads:[~2012-09-19 21:06 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-19 21:05 [PATCH 00/29] More omap header moves for common zImage support Tony Lindgren
2012-09-19 21:05 ` [PATCH 01/29] ARM: OMAP: Remove unused param.h Tony Lindgren
2012-09-19 21:05 ` [PATCH 02/29] ARM: OMAP: Remove smp.h Tony Lindgren
2012-09-19 21:05 ` [PATCH 03/29] ARM: OMAP1: Make plat/mux.h omap1 only Tony Lindgren
2012-09-20 19:26   ` Felipe Balbi
2012-09-19 21:05 ` [PATCH 04/29] ARM: OMAP1: Move board-ams-delta.h from plat to mach Tony Lindgren
2012-09-20  1:16   ` Mark Brown
2012-09-20 17:12     ` Tony Lindgren
2012-09-20 13:41   ` Janusz Krzysztofik
2012-09-20 17:10     ` Tony Lindgren
2012-09-19 21:05 ` [PATCH 05/29] ARM: OMAP2+: Make id.h local Tony Lindgren
2012-09-19 21:05 ` [PATCH 06/29] ARM: OMAP1: Move keypad.h from plat to mach Tony Lindgren
2012-09-20 18:14   ` Tony Lindgren
2012-09-19 21:05 ` [PATCH 07/29] ARM: OMAP1: Move lcd_mipid.h " Tony Lindgren
2012-09-20 18:17   ` Tony Lindgren
2012-09-19 21:05 ` [PATCH 08/29] ARM: OMAP2+: Make board-zoom.h local Tony Lindgren
2012-09-20  1:24   ` Mark Brown
2012-09-20  7:29   ` Peter Ujfalusi
2012-09-20 17:15     ` Tony Lindgren
2012-09-19 21:05 ` [PATCH 09/29] ARM: OMAP2+: Make am35xx.h local Tony Lindgren
2012-09-19 21:06 ` [PATCH 10/29] ARM: OMAP2+: Make board-rx51.h local Tony Lindgren
2012-09-19 21:06 ` [PATCH 11/29] ARM: OMAP2+: Make ctrl_module_core_44xx.h local Tony Lindgren
2012-09-19 21:06 ` [PATCH 12/29] ARM: OMAP2+: Make ctrl_module_pad_core_44xx.h local Tony Lindgren
2012-09-19 21:06 ` [PATCH 13/29] ARM: OMAP2+: Make ctrl_module_pad_wkup_44xx.h local Tony Lindgren
2012-09-19 21:06 ` [PATCH 14/29] ARM: OMAP2+: Make ctrl_module_wkup_44xx.h local Tony Lindgren
2012-09-19 21:06 ` [PATCH 15/29] ARM: OMAP2+: Make omap-secure.h local Tony Lindgren
2012-09-19 21:06 ` [PATCH 16/29] ARM: OMAP2+: Make omap-wakeupgen.h local Tony Lindgren
2012-09-19 21:06 ` [PATCH 17/29] ARM: OMAP1: Move board-sx1.h from plat to mach Tony Lindgren
2012-09-19 21:06 ` [PATCH 18/29] ARM: OMAP1: Move board-voiceblue.h " Tony Lindgren
2012-09-19 21:06 ` [PATCH 19/29] ARM: OMAP2+: Make debug-devices.h local Tony Lindgren
2012-09-19 21:06 ` Tony Lindgren [this message]
2012-09-19 21:06 ` [PATCH 21/29] ARM: OMAP2+: Make gpmc-smc91x.h local Tony Lindgren
2012-09-19 21:06 ` [PATCH 22/29] ARM: OMAP2+: Make gpmc-smsc911x.h local Tony Lindgren
2012-09-19 21:06 ` [PATCH 23/29] ARM: OMAP2+: Make hdq1w.h local Tony Lindgren
2012-09-19 21:06 ` [PATCH 24/29] ARM: OMAP1: Move irda.h from plat to mach Tony Lindgren
2012-09-19 21:06 ` [PATCH 25/29] ARM: OMAP2+: Make l3_2xxx.h local Tony Lindgren
2012-09-19 21:06 ` [PATCH 26/29] ARM: OMAP2+: Make l3_3xxx.h local Tony Lindgren
2012-09-19 21:06 ` [PATCH 27/29] ARM: OMAP2+: Make l4_2xxx.h local Tony Lindgren
2012-09-19 21:06 ` [PATCH 28/29] ARM: OMAP2+: Make l4_3xxx.h local Tony Lindgren
2012-09-19 21:06 ` [PATCH 29/29] ARM: OMAP2+: Make omap4-keypad.h local Tony Lindgren

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:81c41cc dfblob:228e4ca dfblob:ce99021 dfblob:166f90c
dfblob:76411dd dfblob:6c44bb4 dfblob:2469811 dfblob:3ed0d87
dfblob:eda3890 dfblob:8d00068 dfblob:58ef785 dfblob:cbe17fa
dfblob:7ab487c dfblob:5df8672 dfblob:4ce3278 dfblob:b087ba0
dfblob:deb0b00 dfblob:3f485ce dfblob:e5edabf dfblob:87637e7
dfblob:64289ea dfblob:ad75e34 dfblob:401eb3c dfblob:73ae616 )
 OR (
bs:"[PATCH 20/29] ARM: OMAP1: Move flash.h from plat to mach" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120919210622.28074.79557.stgit@muffinssi \
    --to=tony@atomide.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox