diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-09-19 13:33:43 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-09-20 18:02:19 -0400 |
| commit | e27e35ec735fa78c976d30304f852cd2e02c5d1f (patch) | |
| tree | df0dd1fd226538c723919d22585f813fc706a3a5 /arch | |
| parent | 70c494c3122fb3d53518aea53c8cf5d61cad909a (diff) | |
ARM: OMAP1: Move board-ams-delta.h from plat to mach
This is only used by omap1.
And to fix things properly, this should not be included
from the drivers at all.
Acked-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: linux-fbdev@vger.kernel.org
Cc: Artem Bityutskiy <Artem.Bityutskiy@linux.intel.com>
Cc: linux-mtd@lists.infradead.org
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: linux-input@vger.kernel.org
Cc: Peter Ujfalusi <peter.ujfalusi@ti.com>
Cc: Liam Girdwood <lrg@ti.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: alsa-devel@alsa-project.org
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap1/ams-delta-fiq-handler.S | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap1/ams-delta-fiq.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap1/board-ams-delta.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap1/include/mach/board-ams-delta.h (renamed from arch/arm/plat-omap/include/plat/board-ams-delta.h) | 0 |
4 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap1/ams-delta-fiq-handler.S b/arch/arm/mach-omap1/ams-delta-fiq-handler.S index d2b6acce8fc1..3d1e1c250a1a 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 @@ | |||
| 16 | #include <linux/linkage.h> | 16 | #include <linux/linkage.h> |
| 17 | #include <asm/assembler.h> | 17 | #include <asm/assembler.h> |
| 18 | 18 | ||
| 19 | #include <plat/board-ams-delta.h> | 19 | #include <mach/board-ams-delta.h> |
| 20 | 20 | ||
| 21 | #include <mach/irqs.h> | 21 | #include <mach/irqs.h> |
| 22 | #include <mach/ams-delta-fiq.h> | 22 | #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 68e8e5654c0a..f12a12af3523 100644 --- a/arch/arm/mach-omap1/ams-delta-fiq.c +++ b/arch/arm/mach-omap1/ams-delta-fiq.c | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 20 | #include <linux/io.h> | 20 | #include <linux/io.h> |
| 21 | 21 | ||
| 22 | #include <plat/board-ams-delta.h> | 22 | #include <mach/board-ams-delta.h> |
| 23 | 23 | ||
| 24 | #include <asm/fiq.h> | 24 | #include <asm/fiq.h> |
| 25 | 25 | ||
diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c index 275d7e50ae10..9518bf5996dc 100644 --- a/arch/arm/mach-omap1/board-ams-delta.c +++ b/arch/arm/mach-omap1/board-ams-delta.c | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | #include <asm/mach/arch.h> | 35 | #include <asm/mach/arch.h> |
| 36 | #include <asm/mach/map.h> | 36 | #include <asm/mach/map.h> |
| 37 | 37 | ||
| 38 | #include <plat/board-ams-delta.h> | 38 | #include <mach/board-ams-delta.h> |
| 39 | #include <linux/platform_data/keypad-omap.h> | 39 | #include <linux/platform_data/keypad-omap.h> |
| 40 | #include <mach/mux.h> | 40 | #include <mach/mux.h> |
| 41 | 41 | ||
diff --git a/arch/arm/plat-omap/include/plat/board-ams-delta.h b/arch/arm/mach-omap1/include/mach/board-ams-delta.h index ad6f865d1f16..ad6f865d1f16 100644 --- a/arch/arm/plat-omap/include/plat/board-ams-delta.h +++ b/arch/arm/mach-omap1/include/mach/board-ams-delta.h | |||