From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 04/29] ARM: OMAP1: Move board-ams-delta.h from plat to mach
Date: Wed, 19 Sep 2012 14:05:43 -0700 [thread overview]
Message-ID: <20120919210543.28074.10214.stgit@muffinssi> (raw)
In-Reply-To: <20120919205732.28074.43697.stgit@muffinssi>
This is only used by omap1.
And to fix things properly, this should not be included
from the drivers at all.
Cc: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: linux-fbdev at vger.kernel.org
Cc: Artem Bityutskiy <Artem.Bityutskiy@linux.intel.com>
Cc: linux-mtd at lists.infradead.org
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: linux-input at vger.kernel.org
Cc: Peter Ujfalusi <peter.ujfalusi@ti.com>
Cc: Liam Girdwood <lrg@ti.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: alsa-devel at alsa-project.org
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap1/ams-delta-fiq-handler.S | 2 +-
arch/arm/mach-omap1/ams-delta-fiq.c | 2 +-
arch/arm/mach-omap1/board-ams-delta.c | 2 +-
arch/arm/mach-omap1/include/mach/board-ams-delta.h | 0
drivers/input/serio/ams_delta_serio.c | 2 +-
drivers/mtd/nand/ams-delta.c | 2 +-
drivers/video/omap/lcd_ams_delta.c | 2 +-
sound/soc/omap/ams-delta.c | 2 +-
8 files changed, 7 insertions(+), 7 deletions(-)
rename arch/arm/{plat-omap/include/plat/board-ams-delta.h => mach-omap1/include/mach/board-ams-delta.h} (100%)
diff --git a/arch/arm/mach-omap1/ams-delta-fiq-handler.S b/arch/arm/mach-omap1/ams-delta-fiq-handler.S
index d2b6acc..3d1e1c2 100644
--- a/arch/arm/mach-omap1/ams-delta-fiq-handler.S
+++ b/arch/arm/mach-omap1/ams-delta-fiq-handler.S
@@ -16,7 +16,7 @@
#include <linux/linkage.h>
#include <asm/assembler.h>
-#include <plat/board-ams-delta.h>
+#include <mach/board-ams-delta.h>
#include <mach/irqs.h>
#include <mach/ams-delta-fiq.h>
diff --git a/arch/arm/mach-omap1/ams-delta-fiq.c b/arch/arm/mach-omap1/ams-delta-fiq.c
index 68e8e56..f12a12a 100644
--- a/arch/arm/mach-omap1/ams-delta-fiq.c
+++ b/arch/arm/mach-omap1/ams-delta-fiq.c
@@ -19,7 +19,7 @@
#include <linux/module.h>
#include <linux/io.h>
-#include <plat/board-ams-delta.h>
+#include <mach/board-ams-delta.h>
#include <asm/fiq.h>
diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c
index 05af063..b9929cb 100644
--- a/arch/arm/mach-omap1/board-ams-delta.c
+++ b/arch/arm/mach-omap1/board-ams-delta.c
@@ -35,7 +35,7 @@
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
-#include <plat/board-ams-delta.h>
+#include <mach/board-ams-delta.h>
#include <plat/keypad.h>
#include <mach/mux.h>
diff --git a/arch/arm/plat-omap/include/plat/board-ams-delta.h b/arch/arm/mach-omap1/include/mach/board-ams-delta.h
similarity index 100%
rename from arch/arm/plat-omap/include/plat/board-ams-delta.h
rename to arch/arm/mach-omap1/include/mach/board-ams-delta.h
diff --git a/drivers/input/serio/ams_delta_serio.c b/drivers/input/serio/ams_delta_serio.c
index f5fbdf9..45887e3 100644
--- a/drivers/input/serio/ams_delta_serio.c
+++ b/drivers/input/serio/ams_delta_serio.c
@@ -27,7 +27,7 @@
#include <linux/module.h>
#include <asm/mach-types.h>
-#include <plat/board-ams-delta.h>
+#include <mach/board-ams-delta.h>
#include <mach/ams-delta-fiq.h>
diff --git a/drivers/mtd/nand/ams-delta.c b/drivers/mtd/nand/ams-delta.c
index c28eec0..9e7723a 100644
--- a/drivers/mtd/nand/ams-delta.c
+++ b/drivers/mtd/nand/ams-delta.c
@@ -29,7 +29,7 @@
#include <asm/io.h>
#include <asm/sizes.h>
-#include <plat/board-ams-delta.h>
+#include <mach/board-ams-delta.h>
#include <mach/hardware.h>
diff --git a/drivers/video/omap/lcd_ams_delta.c b/drivers/video/omap/lcd_ams_delta.c
index 5cca6b3..ed4cad8 100644
--- a/drivers/video/omap/lcd_ams_delta.c
+++ b/drivers/video/omap/lcd_ams_delta.c
@@ -27,7 +27,7 @@
#include <linux/lcd.h>
#include <linux/gpio.h>
-#include <plat/board-ams-delta.h>
+#include <mach/board-ams-delta.h>
#include "omapfb.h"
diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/omap/ams-delta.c
index 7b18b74..98e25d5 100644
--- a/sound/soc/omap/ams-delta.c
+++ b/sound/soc/omap/ams-delta.c
@@ -32,7 +32,7 @@
#include <asm/mach-types.h>
-#include <plat/board-ams-delta.h>
+#include <mach/board-ams-delta.h>
#include <plat/mcbsp.h>
#include "omap-mcbsp.h"
next prev parent reply other threads:[~2012-09-19 21:05 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 ` Tony Lindgren [this message]
2012-09-20 1:16 ` [PATCH 04/29] ARM: OMAP1: Move board-ams-delta.h from plat to mach 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 ` [PATCH 20/29] ARM: OMAP1: Move flash.h from plat to mach Tony Lindgren
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
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=20120919210543.28074.10214.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