From 3376afd85b3fc57b0a5c0648f7201c7b15ff3335 Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Sun, 10 Jul 2005 19:58:11 +0100
Subject: [PATCH] --- yaml --- r: 4434 b: refs/heads/master c:
 dbdf9cedfcc81202360763530412d746d798b7b6 h: refs/heads/master v: v3

---
 [refs]                                                     | 2 +-
 trunk/arch/arm/{mach-omap => mach-omap1}/board-generic.c   | 2 +-
 trunk/arch/arm/{mach-omap => mach-omap1}/board-h2.c        | 2 +-
 trunk/arch/arm/{mach-omap => mach-omap1}/board-h3.c        | 2 +-
 trunk/arch/arm/{mach-omap => mach-omap1}/board-innovator.c | 2 +-
 trunk/arch/arm/{mach-omap => mach-omap1}/board-netstar.c   | 0
 trunk/arch/arm/{mach-omap => mach-omap1}/board-osk.c       | 2 +-
 trunk/arch/arm/{mach-omap => mach-omap1}/board-perseus2.c  | 2 +-
 trunk/arch/arm/{mach-omap => mach-omap1}/board-voiceblue.c | 2 +-
 9 files changed, 8 insertions(+), 8 deletions(-)
 rename trunk/arch/arm/{mach-omap => mach-omap1}/board-generic.c (98%)
 rename trunk/arch/arm/{mach-omap => mach-omap1}/board-h2.c (99%)
 rename trunk/arch/arm/{mach-omap => mach-omap1}/board-h3.c (99%)
 rename trunk/arch/arm/{mach-omap => mach-omap1}/board-innovator.c (99%)
 rename trunk/arch/arm/{mach-omap => mach-omap1}/board-netstar.c (100%)
 rename trunk/arch/arm/{mach-omap => mach-omap1}/board-osk.c (99%)
 rename trunk/arch/arm/{mach-omap => mach-omap1}/board-perseus2.c (98%)
 rename trunk/arch/arm/{mach-omap => mach-omap1}/board-voiceblue.c (99%)

diff --git a/[refs] b/[refs]
index a5e20a8ba532..ea9130029428 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f3e14163e066a6f43a54098a12185f25400fd68
+refs/heads/master: dbdf9cedfcc81202360763530412d746d798b7b6
diff --git a/trunk/arch/arm/mach-omap/board-generic.c b/trunk/arch/arm/mach-omap1/board-generic.c
similarity index 98%
rename from trunk/arch/arm/mach-omap/board-generic.c
rename to trunk/arch/arm/mach-omap1/board-generic.c
index 384bc7cec1db..e2d338488d10 100644
--- a/trunk/arch/arm/mach-omap/board-generic.c
+++ b/trunk/arch/arm/mach-omap1/board-generic.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-omap/board-generic.c
+ * linux/arch/arm/mach-omap1/board-generic.c
  *
  * Modified from board-innovator1510.c
  *
diff --git a/trunk/arch/arm/mach-omap/board-h2.c b/trunk/arch/arm/mach-omap1/board-h2.c
similarity index 99%
rename from trunk/arch/arm/mach-omap/board-h2.c
rename to trunk/arch/arm/mach-omap1/board-h2.c
index f37c76a9b163..02c7e335d3ef 100644
--- a/trunk/arch/arm/mach-omap/board-h2.c
+++ b/trunk/arch/arm/mach-omap1/board-h2.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-omap/board-h2.c
+ * linux/arch/arm/mach-omap1/board-h2.c
  *
  * Board specific inits for OMAP-1610 H2
  *
diff --git a/trunk/arch/arm/mach-omap/board-h3.c b/trunk/arch/arm/mach-omap1/board-h3.c
similarity index 99%
rename from trunk/arch/arm/mach-omap/board-h3.c
rename to trunk/arch/arm/mach-omap1/board-h3.c
index 705e48594e9a..3ff6eb8c8f2a 100644
--- a/trunk/arch/arm/mach-omap/board-h3.c
+++ b/trunk/arch/arm/mach-omap1/board-h3.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-omap/board-h3.c
+ * linux/arch/arm/mach-omap1/board-h3.c
  *
  * This file contains OMAP1710 H3 specific code.
  *
diff --git a/trunk/arch/arm/mach-omap/board-innovator.c b/trunk/arch/arm/mach-omap1/board-innovator.c
similarity index 99%
rename from trunk/arch/arm/mach-omap/board-innovator.c
rename to trunk/arch/arm/mach-omap1/board-innovator.c
index 523363f18cc0..944e235d78a8 100644
--- a/trunk/arch/arm/mach-omap/board-innovator.c
+++ b/trunk/arch/arm/mach-omap1/board-innovator.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-omap/board-innovator.c
+ * linux/arch/arm/mach-omap1/board-innovator.c
  *
  * Board specific inits for OMAP-1510 and OMAP-1610 Innovator
  *
diff --git a/trunk/arch/arm/mach-omap/board-netstar.c b/trunk/arch/arm/mach-omap1/board-netstar.c
similarity index 100%
rename from trunk/arch/arm/mach-omap/board-netstar.c
rename to trunk/arch/arm/mach-omap1/board-netstar.c
diff --git a/trunk/arch/arm/mach-omap/board-osk.c b/trunk/arch/arm/mach-omap1/board-osk.c
similarity index 99%
rename from trunk/arch/arm/mach-omap/board-osk.c
rename to trunk/arch/arm/mach-omap1/board-osk.c
index cb433436aa08..b9e3273ac0b0 100644
--- a/trunk/arch/arm/mach-omap/board-osk.c
+++ b/trunk/arch/arm/mach-omap1/board-osk.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-omap/board-osk.c
+ * linux/arch/arm/mach-omap1/board-osk.c
  *
  * Board specific init for OMAP5912 OSK
  *
diff --git a/trunk/arch/arm/mach-omap/board-perseus2.c b/trunk/arch/arm/mach-omap1/board-perseus2.c
similarity index 98%
rename from trunk/arch/arm/mach-omap/board-perseus2.c
rename to trunk/arch/arm/mach-omap1/board-perseus2.c
index d5342043d48f..0d460522fcaf 100644
--- a/trunk/arch/arm/mach-omap/board-perseus2.c
+++ b/trunk/arch/arm/mach-omap1/board-perseus2.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-omap/board-perseus2.c
+ * linux/arch/arm/mach-omap1/board-perseus2.c
  *
  * Modified from board-generic.c
  *
diff --git a/trunk/arch/arm/mach-omap/board-voiceblue.c b/trunk/arch/arm/mach-omap1/board-voiceblue.c
similarity index 99%
rename from trunk/arch/arm/mach-omap/board-voiceblue.c
rename to trunk/arch/arm/mach-omap1/board-voiceblue.c
index 6b0c5003d719..d882f43658a0 100644
--- a/trunk/arch/arm/mach-omap/board-voiceblue.c
+++ b/trunk/arch/arm/mach-omap1/board-voiceblue.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-omap/board-voiceblue.c
+ * linux/arch/arm/mach-omap1/board-voiceblue.c
  *
  * Modified from board-generic.c
  *