From 9384100ede182eb701c8c086380fc6212166aed9 Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Fri, 31 Aug 2012 17:04:35 -0700
Subject: [PATCH] --- yaml --- r: 326520 b: refs/heads/master c:
 68cb700c59fae6cd539c9dc1e9f2584f671935a0 h: refs/heads/master v: v3

---
 [refs]                                                      | 2 +-
 trunk/arch/arm/mach-omap1/board-htcherald.c                 | 2 +-
 trunk/arch/arm/mach-omap1/devices.c                         | 2 +-
 trunk/arch/arm/mach-omap1/include/mach/hardware.h           | 6 +++---
 .../include/plat => mach-omap1/include/mach}/omap1510.h     | 3 +--
 .../include/plat => mach-omap1/include/mach}/omap16xx.h     | 3 +--
 .../include/plat => mach-omap1/include/mach}/omap7xx.h      | 3 +--
 trunk/drivers/spi/spi-omap-uwire.c                          | 3 ++-
 8 files changed, 11 insertions(+), 13 deletions(-)
 rename trunk/arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/omap1510.h (97%)
 rename trunk/arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/omap16xx.h (99%)
 rename trunk/arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/omap7xx.h (98%)

diff --git a/[refs] b/[refs]
index d2d787731284..1162c7aeaa02 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c49f34bc25900c3c6638fed0987c9abea3c212ea
+refs/heads/master: 68cb700c59fae6cd539c9dc1e9f2584f671935a0
diff --git a/trunk/arch/arm/mach-omap1/board-htcherald.c b/trunk/arch/arm/mach-omap1/board-htcherald.c
index b9771b5a5f7b..a5ac352d68d3 100644
--- a/trunk/arch/arm/mach-omap1/board-htcherald.c
+++ b/trunk/arch/arm/mach-omap1/board-htcherald.c
@@ -41,7 +41,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
-#include <plat/omap7xx.h>
+#include <mach/omap7xx.h>
 #include <plat/keypad.h>
 #include <plat/mmc.h>
 
diff --git a/trunk/arch/arm/mach-omap1/devices.c b/trunk/arch/arm/mach-omap1/devices.c
index 1feca354ce08..05fdbd992c77 100644
--- a/trunk/arch/arm/mach-omap1/devices.c
+++ b/trunk/arch/arm/mach-omap1/devices.c
@@ -23,8 +23,8 @@
 #include <plat/mux.h>
 #include <plat/dma.h>
 #include <plat/mmc.h>
-#include <plat/omap7xx.h>
 
+#include <mach/omap7xx.h>
 #include <mach/camera.h>
 #include <mach/hardware.h>
 
diff --git a/trunk/arch/arm/mach-omap1/include/mach/hardware.h b/trunk/arch/arm/mach-omap1/include/mach/hardware.h
index bd3b95e1cb02..84248d250adb 100644
--- a/trunk/arch/arm/mach-omap1/include/mach/hardware.h
+++ b/trunk/arch/arm/mach-omap1/include/mach/hardware.h
@@ -311,8 +311,8 @@ static inline u32 omap_cs3_phys(void)
  * ---------------------------------------------------------------------------
  */
 
-#include <plat/omap7xx.h>
-#include <plat/omap1510.h>
-#include <plat/omap16xx.h>
+#include "omap7xx.h"
+#include "omap1510.h"
+#include "omap16xx.h"
 
 #endif	/* __ASM_ARCH_OMAP_HARDWARE_H */
diff --git a/trunk/arch/arm/plat-omap/include/plat/omap1510.h b/trunk/arch/arm/mach-omap1/include/mach/omap1510.h
similarity index 97%
rename from trunk/arch/arm/plat-omap/include/plat/omap1510.h
rename to trunk/arch/arm/mach-omap1/include/mach/omap1510.h
index d24004668138..8fe05d6137c0 100644
--- a/trunk/arch/arm/plat-omap/include/plat/omap1510.h
+++ b/trunk/arch/arm/mach-omap1/include/mach/omap1510.h
@@ -1,5 +1,4 @@
-/* arch/arm/plat-omap/include/mach/omap1510.h
- *
+/*
  * Hardware definitions for TI OMAP1510 processor.
  *
  * Cleanup for Linux-2.6 by Dirk Behme <dirk.behme@de.bosch.com>
diff --git a/trunk/arch/arm/plat-omap/include/plat/omap16xx.h b/trunk/arch/arm/mach-omap1/include/mach/omap16xx.h
similarity index 99%
rename from trunk/arch/arm/plat-omap/include/plat/omap16xx.h
rename to trunk/arch/arm/mach-omap1/include/mach/omap16xx.h
index e69e1d857b45..cd1c724869c7 100644
--- a/trunk/arch/arm/plat-omap/include/plat/omap16xx.h
+++ b/trunk/arch/arm/mach-omap1/include/mach/omap16xx.h
@@ -1,5 +1,4 @@
-/* arch/arm/plat-omap/include/mach/omap16xx.h
- *
+/*
  * Hardware definitions for TI OMAP1610/5912/1710 processors.
  *
  * Cleanup for Linux-2.6 by Dirk Behme <dirk.behme@de.bosch.com>
diff --git a/trunk/arch/arm/plat-omap/include/plat/omap7xx.h b/trunk/arch/arm/mach-omap1/include/mach/omap7xx.h
similarity index 98%
rename from trunk/arch/arm/plat-omap/include/plat/omap7xx.h
rename to trunk/arch/arm/mach-omap1/include/mach/omap7xx.h
index 48e4757e1e30..63da994bc609 100644
--- a/trunk/arch/arm/plat-omap/include/plat/omap7xx.h
+++ b/trunk/arch/arm/mach-omap1/include/mach/omap7xx.h
@@ -1,5 +1,4 @@
-/* arch/arm/plat-omap/include/mach/omap7xx.h
- *
+/*
  * Hardware definitions for TI OMAP7XX processor.
  *
  * Cleanup for Linux-2.6 by Dirk Behme <dirk.behme@de.bosch.com>
diff --git a/trunk/drivers/spi/spi-omap-uwire.c b/trunk/drivers/spi/spi-omap-uwire.c
index 9b0d71696039..a3996a1c6345 100644
--- a/trunk/drivers/spi/spi-omap-uwire.c
+++ b/trunk/drivers/spi/spi-omap-uwire.c
@@ -53,7 +53,8 @@
 #include <asm/mach-types.h>
 
 #include <plat/mux.h>
-#include <plat/omap7xx.h>	/* OMAP7XX_IO_CONF registers */
+
+#include <mach/omap7xx.h>	/* OMAP7XX_IO_CONF registers */
 
 
 /* FIXME address is now a platform device resource,