From a58d76b7131653184f7c23b3c72ca4a488a6d6e7 Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Mon, 23 Mar 2009 18:07:33 -0700
Subject: [PATCH] --- yaml --- r: 137465 b: refs/heads/master c:
 eb6b0b1832a779cfa65bb66b8a88454d988a1d69 h: refs/heads/master i:   137463:
 4bcafa8698ae126bf1c0dec3e97d1e8fb9d33b5e v: v3

---
 [refs]                                                       | 2 +-
 trunk/arch/arm/mach-omap1/board-h2-mmc.c                     | 2 ++
 trunk/arch/arm/mach-omap1/board-h2.c                         | 5 +++++
 .../arm/{plat-omap/include/mach => mach-omap1}/board-h2.h    | 5 +----
 trunk/arch/arm/plat-omap/include/mach/hardware.h             | 4 ----
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename trunk/arch/arm/{plat-omap/include/mach => mach-omap1}/board-h2.h (90%)

diff --git a/[refs] b/[refs]
index a3cea333242b..9911bc8b97e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9558b19f2d1f01f6a11e148405cd3af63b8d6a8
+refs/heads/master: eb6b0b1832a779cfa65bb66b8a88454d988a1d69
diff --git a/trunk/arch/arm/mach-omap1/board-h2-mmc.c b/trunk/arch/arm/mach-omap1/board-h2-mmc.c
index 409fa56d0a87..44d4a966bed9 100644
--- a/trunk/arch/arm/mach-omap1/board-h2-mmc.c
+++ b/trunk/arch/arm/mach-omap1/board-h2-mmc.c
@@ -19,6 +19,8 @@
 #include <mach/mmc.h>
 #include <mach/gpio.h>
 
+#include "board-h2.h"
+
 #if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE)
 
 static int mmc_set_power(struct device *dev, int slot, int power_on,
diff --git a/trunk/arch/arm/mach-omap1/board-h2.c b/trunk/arch/arm/mach-omap1/board-h2.c
index 0d784a795092..b31b6d9b2e3f 100644
--- a/trunk/arch/arm/mach-omap1/board-h2.c
+++ b/trunk/arch/arm/mach-omap1/board-h2.c
@@ -46,6 +46,11 @@
 #include <mach/keypad.h>
 #include <mach/common.h>
 
+#include "board-h2.h"
+
+/* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */
+#define OMAP1610_ETHR_START		0x04000300
+
 static int h2_keymap[] = {
 	KEY(0, 0, KEY_LEFT),
 	KEY(0, 1, KEY_RIGHT),
diff --git a/trunk/arch/arm/plat-omap/include/mach/board-h2.h b/trunk/arch/arm/mach-omap1/board-h2.h
similarity index 90%
rename from trunk/arch/arm/plat-omap/include/mach/board-h2.h
rename to trunk/arch/arm/mach-omap1/board-h2.h
index 15531c8dc0e6..315e2662547e 100644
--- a/trunk/arch/arm/plat-omap/include/mach/board-h2.h
+++ b/trunk/arch/arm/mach-omap1/board-h2.h
@@ -1,5 +1,5 @@
 /*
- * arch/arm/plat-omap/include/mach/board-h2.h
+ * arch/arm/mach-omap1/board-h2.h
  *
  * Hardware definitions for TI OMAP1610 H2 board.
  *
@@ -29,9 +29,6 @@
 #ifndef __ASM_ARCH_OMAP_H2_H
 #define __ASM_ARCH_OMAP_H2_H
 
-/* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */
-#define OMAP1610_ETHR_START		0x04000300
-
 #define H2_TPS_GPIO_BASE		(OMAP_MAX_GPIO_LINES + 16 /* MPUIO */)
 #	define H2_TPS_GPIO_MMC_PWR_EN	(H2_TPS_GPIO_BASE + 3)
 
diff --git a/trunk/arch/arm/plat-omap/include/mach/hardware.h b/trunk/arch/arm/plat-omap/include/mach/hardware.h
index 5b59188eceae..ac4d8d051557 100644
--- a/trunk/arch/arm/plat-omap/include/mach/hardware.h
+++ b/trunk/arch/arm/plat-omap/include/mach/hardware.h
@@ -298,10 +298,6 @@
 #include "board-innovator.h"
 #endif
 
-#ifdef CONFIG_MACH_OMAP_H2
-#include "board-h2.h"
-#endif
-
 #ifdef CONFIG_MACH_OMAP_H3
 #include "board-h3.h"
 #endif