From: Tony Lindgren <tony@atomide.com>
To: linux-arm-kernel@lists.infradead.org
Cc: linux-omap@vger.kernel.org
Subject: [PATCH 22/29] ARM: OMAP2+: Make gpmc-smsc911x.h local
Date: Wed, 19 Sep 2012 14:06:26 -0700 [thread overview]
Message-ID: <20120919210626.28074.18747.stgit@muffinssi> (raw)
In-Reply-To: <20120919205732.28074.43697.stgit@muffinssi>
This can be local to mach-omap2.
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap2/board-cm-t35.c | 2 +-
arch/arm/mach-omap2/board-igep0020.c | 2 +-
arch/arm/mach-omap2/board-ldp.c | 2 +-
arch/arm/mach-omap2/board-omap3evm.c | 2 +-
arch/arm/mach-omap2/board-omap3logic.c | 2 +-
arch/arm/mach-omap2/board-omap3stalker.c | 2 +-
arch/arm/mach-omap2/board-overo.c | 2 +-
arch/arm/mach-omap2/board-zoom-debugboard.c | 2 +-
arch/arm/mach-omap2/gpmc-smsc911x.c | 2 +-
arch/arm/mach-omap2/gpmc-smsc911x.h | 0
10 files changed, 9 insertions(+), 9 deletions(-)
rename arch/arm/{plat-omap/include/plat/gpmc-smsc911x.h => mach-omap2/gpmc-smsc911x.h} (100%)
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
index 2cbb825..f3a9cec 100644
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -64,7 +64,7 @@
#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
#include <linux/smsc911x.h>
-#include <plat/gpmc-smsc911x.h>
+#include "gpmc-smsc911x.h"
static struct omap_smsc911x_platform_data cm_t35_smsc911x_cfg = {
.id = 0,
diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c
index 1b2e9a3..e2a94d8f 100644
--- a/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@ -192,7 +192,7 @@ static void __init igep_flash_init(void) {}
#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
#include <linux/smsc911x.h>
-#include <plat/gpmc-smsc911x.h>
+#include "gpmc-smsc911x.h"
static struct omap_smsc911x_platform_data smsc911x_cfg = {
.cs = IGEP2_SMSC911X_CS,
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c
index d0372a6..5682147 100644
--- a/arch/arm/mach-omap2/board-ldp.c
+++ b/arch/arm/mach-omap2/board-ldp.c
@@ -38,7 +38,7 @@
#include <plat/gpmc.h>
#include "board-zoom.h"
#include <plat/usb.h>
-#include <plat/gpmc-smsc911x.h>
+#include "gpmc-smsc911x.h"
#include <video/omapdss.h>
#include <video/omap-panel-generic-dpi.h>
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index 6a1c849..9d54178 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -119,7 +119,7 @@ static void __init omap3_evm_get_revision(void)
}
#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
-#include <plat/gpmc-smsc911x.h>
+#include "gpmc-smsc911x.h"
static struct omap_smsc911x_platform_data smsc911x_cfg = {
.cs = OMAP3EVM_SMSC911X_CS,
diff --git a/arch/arm/mach-omap2/board-omap3logic.c b/arch/arm/mach-omap2/board-omap3logic.c
index b5e56fa..7bd8253 100644
--- a/arch/arm/mach-omap2/board-omap3logic.c
+++ b/arch/arm/mach-omap2/board-omap3logic.c
@@ -34,7 +34,7 @@
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
-#include <plat/gpmc-smsc911x.h>
+#include "gpmc-smsc911x.h"
#include <plat/gpmc.h>
#include <plat/sdrc.h>
#include <plat/usb.h>
diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c
index b8756f0..a083f81 100644
--- a/arch/arm/mach-omap2/board-omap3stalker.c
+++ b/arch/arm/mach-omap2/board-omap3stalker.c
@@ -60,7 +60,7 @@
#include "common-board-devices.h"
#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
-#include <plat/gpmc-smsc911x.h>
+#include "gpmc-smsc911x.h"
#define OMAP3STALKER_ETHR_START 0x2c000000
#define OMAP3STALKER_ETHR_SIZE 1024
diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c
index 90d57fb..e34a1ea 100644
--- a/arch/arm/mach-omap2/board-overo.c
+++ b/arch/arm/mach-omap2/board-overo.c
@@ -113,7 +113,7 @@ static inline void __init overo_ads7846_init(void) { return; }
#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
#include <linux/smsc911x.h>
-#include <plat/gpmc-smsc911x.h>
+#include "gpmc-smsc911x.h"
static struct omap_smsc911x_platform_data smsc911x_cfg = {
.id = 0,
diff --git a/arch/arm/mach-omap2/board-zoom-debugboard.c b/arch/arm/mach-omap2/board-zoom-debugboard.c
index 42c97c2..36c8767 100644
--- a/arch/arm/mach-omap2/board-zoom-debugboard.c
+++ b/arch/arm/mach-omap2/board-zoom-debugboard.c
@@ -18,7 +18,7 @@
#include <linux/regulator/machine.h>
#include <plat/gpmc.h>
-#include <plat/gpmc-smsc911x.h>
+#include "gpmc-smsc911x.h"
#include "board-zoom.h"
diff --git a/arch/arm/mach-omap2/gpmc-smsc911x.c b/arch/arm/mach-omap2/gpmc-smsc911x.c
index a3a2887..249a0b4 100644
--- a/arch/arm/mach-omap2/gpmc-smsc911x.c
+++ b/arch/arm/mach-omap2/gpmc-smsc911x.c
@@ -21,7 +21,7 @@
#include <linux/smsc911x.h>
#include <plat/gpmc.h>
-#include <plat/gpmc-smsc911x.h>
+#include "gpmc-smsc911x.h"
static struct resource gpmc_smsc911x_resources[] = {
[0] = {
diff --git a/arch/arm/plat-omap/include/plat/gpmc-smsc911x.h b/arch/arm/mach-omap2/gpmc-smsc911x.h
similarity index 100%
rename from arch/arm/plat-omap/include/plat/gpmc-smsc911x.h
rename to arch/arm/mach-omap2/gpmc-smsc911x.h
WARNING: multiple messages have this Message-ID (diff)
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 22/29] ARM: OMAP2+: Make gpmc-smsc911x.h local
Date: Wed, 19 Sep 2012 14:06:26 -0700 [thread overview]
Message-ID: <20120919210626.28074.18747.stgit@muffinssi> (raw)
In-Reply-To: <20120919205732.28074.43697.stgit@muffinssi>
This can be local to mach-omap2.
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap2/board-cm-t35.c | 2 +-
arch/arm/mach-omap2/board-igep0020.c | 2 +-
arch/arm/mach-omap2/board-ldp.c | 2 +-
arch/arm/mach-omap2/board-omap3evm.c | 2 +-
arch/arm/mach-omap2/board-omap3logic.c | 2 +-
arch/arm/mach-omap2/board-omap3stalker.c | 2 +-
arch/arm/mach-omap2/board-overo.c | 2 +-
arch/arm/mach-omap2/board-zoom-debugboard.c | 2 +-
arch/arm/mach-omap2/gpmc-smsc911x.c | 2 +-
arch/arm/mach-omap2/gpmc-smsc911x.h | 0
10 files changed, 9 insertions(+), 9 deletions(-)
rename arch/arm/{plat-omap/include/plat/gpmc-smsc911x.h => mach-omap2/gpmc-smsc911x.h} (100%)
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
index 2cbb825..f3a9cec 100644
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -64,7 +64,7 @@
#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
#include <linux/smsc911x.h>
-#include <plat/gpmc-smsc911x.h>
+#include "gpmc-smsc911x.h"
static struct omap_smsc911x_platform_data cm_t35_smsc911x_cfg = {
.id = 0,
diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c
index 1b2e9a3..e2a94d8f 100644
--- a/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@ -192,7 +192,7 @@ static void __init igep_flash_init(void) {}
#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
#include <linux/smsc911x.h>
-#include <plat/gpmc-smsc911x.h>
+#include "gpmc-smsc911x.h"
static struct omap_smsc911x_platform_data smsc911x_cfg = {
.cs = IGEP2_SMSC911X_CS,
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c
index d0372a6..5682147 100644
--- a/arch/arm/mach-omap2/board-ldp.c
+++ b/arch/arm/mach-omap2/board-ldp.c
@@ -38,7 +38,7 @@
#include <plat/gpmc.h>
#include "board-zoom.h"
#include <plat/usb.h>
-#include <plat/gpmc-smsc911x.h>
+#include "gpmc-smsc911x.h"
#include <video/omapdss.h>
#include <video/omap-panel-generic-dpi.h>
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index 6a1c849..9d54178 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -119,7 +119,7 @@ static void __init omap3_evm_get_revision(void)
}
#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
-#include <plat/gpmc-smsc911x.h>
+#include "gpmc-smsc911x.h"
static struct omap_smsc911x_platform_data smsc911x_cfg = {
.cs = OMAP3EVM_SMSC911X_CS,
diff --git a/arch/arm/mach-omap2/board-omap3logic.c b/arch/arm/mach-omap2/board-omap3logic.c
index b5e56fa..7bd8253 100644
--- a/arch/arm/mach-omap2/board-omap3logic.c
+++ b/arch/arm/mach-omap2/board-omap3logic.c
@@ -34,7 +34,7 @@
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
-#include <plat/gpmc-smsc911x.h>
+#include "gpmc-smsc911x.h"
#include <plat/gpmc.h>
#include <plat/sdrc.h>
#include <plat/usb.h>
diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c
index b8756f0..a083f81 100644
--- a/arch/arm/mach-omap2/board-omap3stalker.c
+++ b/arch/arm/mach-omap2/board-omap3stalker.c
@@ -60,7 +60,7 @@
#include "common-board-devices.h"
#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
-#include <plat/gpmc-smsc911x.h>
+#include "gpmc-smsc911x.h"
#define OMAP3STALKER_ETHR_START 0x2c000000
#define OMAP3STALKER_ETHR_SIZE 1024
diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c
index 90d57fb..e34a1ea 100644
--- a/arch/arm/mach-omap2/board-overo.c
+++ b/arch/arm/mach-omap2/board-overo.c
@@ -113,7 +113,7 @@ static inline void __init overo_ads7846_init(void) { return; }
#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
#include <linux/smsc911x.h>
-#include <plat/gpmc-smsc911x.h>
+#include "gpmc-smsc911x.h"
static struct omap_smsc911x_platform_data smsc911x_cfg = {
.id = 0,
diff --git a/arch/arm/mach-omap2/board-zoom-debugboard.c b/arch/arm/mach-omap2/board-zoom-debugboard.c
index 42c97c2..36c8767 100644
--- a/arch/arm/mach-omap2/board-zoom-debugboard.c
+++ b/arch/arm/mach-omap2/board-zoom-debugboard.c
@@ -18,7 +18,7 @@
#include <linux/regulator/machine.h>
#include <plat/gpmc.h>
-#include <plat/gpmc-smsc911x.h>
+#include "gpmc-smsc911x.h"
#include "board-zoom.h"
diff --git a/arch/arm/mach-omap2/gpmc-smsc911x.c b/arch/arm/mach-omap2/gpmc-smsc911x.c
index a3a2887..249a0b4 100644
--- a/arch/arm/mach-omap2/gpmc-smsc911x.c
+++ b/arch/arm/mach-omap2/gpmc-smsc911x.c
@@ -21,7 +21,7 @@
#include <linux/smsc911x.h>
#include <plat/gpmc.h>
-#include <plat/gpmc-smsc911x.h>
+#include "gpmc-smsc911x.h"
static struct resource gpmc_smsc911x_resources[] = {
[0] = {
diff --git a/arch/arm/plat-omap/include/plat/gpmc-smsc911x.h b/arch/arm/mach-omap2/gpmc-smsc911x.h
similarity index 100%
rename from arch/arm/plat-omap/include/plat/gpmc-smsc911x.h
rename to arch/arm/mach-omap2/gpmc-smsc911x.h
next prev parent reply other threads:[~2012-09-19 21:06 UTC|newest]
Thread overview: 92+ 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 ` Tony Lindgren
2012-09-19 21:05 ` [PATCH 01/29] ARM: OMAP: Remove unused param.h Tony Lindgren
2012-09-19 21:05 ` Tony Lindgren
2012-09-19 21:05 ` [PATCH 02/29] ARM: OMAP: Remove smp.h Tony Lindgren
2012-09-19 21:05 ` Tony Lindgren
2012-09-19 21:05 ` [PATCH 03/29] ARM: OMAP1: Make plat/mux.h omap1 only Tony Lindgren
2012-09-19 21:05 ` Tony Lindgren
2012-09-20 19:26 ` Felipe Balbi
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-19 21:05 ` Tony Lindgren
2012-09-19 21:05 ` Tony Lindgren
2012-09-19 21:05 ` Tony Lindgren
2012-09-20 1:16 ` Mark Brown
2012-09-20 1:16 ` Mark Brown
2012-09-20 1:16 ` Mark Brown
2012-09-20 1:16 ` Mark Brown
2012-09-20 17:12 ` Tony Lindgren
2012-09-20 17:12 ` Tony Lindgren
2012-09-20 17:12 ` Tony Lindgren
2012-09-20 17:12 ` Tony Lindgren
2012-09-20 13:41 ` Janusz Krzysztofik
2012-09-20 13:41 ` Janusz Krzysztofik
2012-09-20 13:41 ` Janusz Krzysztofik
2012-09-20 13:41 ` Janusz Krzysztofik
2012-09-20 17:10 ` Tony Lindgren
2012-09-20 17:10 ` Tony Lindgren
2012-09-20 17:10 ` Tony Lindgren
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 ` Tony Lindgren
2012-09-19 21:05 ` [PATCH 06/29] ARM: OMAP1: Move keypad.h from plat to mach Tony Lindgren
2012-09-19 21:05 ` Tony Lindgren
2012-09-20 18:14 ` 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-19 21:05 ` Tony Lindgren
2012-09-19 21:05 ` Tony Lindgren
2012-09-20 18:17 ` Tony Lindgren
2012-09-20 18:17 ` 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-19 21:05 ` Tony Lindgren
2012-09-20 1:24 ` Mark Brown
2012-09-20 1:24 ` Mark Brown
2012-09-20 7:29 ` Peter Ujfalusi
2012-09-20 7:29 ` Peter Ujfalusi
2012-09-20 17:15 ` Tony Lindgren
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:05 ` Tony Lindgren
2012-09-19 21:06 ` [PATCH 10/29] ARM: OMAP2+: Make board-rx51.h local Tony Lindgren
2012-09-19 21:06 ` 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 ` 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 ` 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 ` 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 ` Tony Lindgren
2012-09-19 21:06 ` [PATCH 15/29] ARM: OMAP2+: Make omap-secure.h local Tony Lindgren
2012-09-19 21:06 ` Tony Lindgren
2012-09-19 21:06 ` [PATCH 16/29] ARM: OMAP2+: Make omap-wakeupgen.h local Tony Lindgren
2012-09-19 21:06 ` 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 ` Tony Lindgren
2012-09-19 21:06 ` [PATCH 18/29] ARM: OMAP1: Move board-voiceblue.h " Tony Lindgren
2012-09-19 21:06 ` 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
2012-09-19 21:06 ` [PATCH 20/29] ARM: OMAP1: Move flash.h from plat to mach Tony Lindgren
2012-09-19 21:06 ` Tony Lindgren
2012-09-19 21:06 ` [PATCH 21/29] ARM: OMAP2+: Make gpmc-smc91x.h local Tony Lindgren
2012-09-19 21:06 ` Tony Lindgren
2012-09-19 21:06 ` Tony Lindgren [this message]
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 ` 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 ` Tony Lindgren
2012-09-19 21:06 ` [PATCH 25/29] ARM: OMAP2+: Make l3_2xxx.h local Tony Lindgren
2012-09-19 21:06 ` Tony Lindgren
2012-09-19 21:06 ` [PATCH 26/29] ARM: OMAP2+: Make l3_3xxx.h local Tony Lindgren
2012-09-19 21:06 ` Tony Lindgren
2012-09-19 21:06 ` [PATCH 27/29] ARM: OMAP2+: Make l4_2xxx.h local Tony Lindgren
2012-09-19 21:06 ` Tony Lindgren
2012-09-19 21:06 ` [PATCH 28/29] ARM: OMAP2+: Make l4_3xxx.h local Tony Lindgren
2012-09-19 21:06 ` Tony Lindgren
2012-09-19 21:06 ` [PATCH 29/29] ARM: OMAP2+: Make omap4-keypad.h local Tony Lindgren
2012-09-19 21:06 ` Tony Lindgren
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=20120919210626.28074.18747.stgit@muffinssi \
--to=tony@atomide.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.