From 033c5f7601777c5cb33296824354cf3a56c1298d Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Wed, 27 Sep 2006 17:17:27 +0900
Subject: [PATCH] --- yaml --- r: 36289 b: refs/heads/master c:
 adf1890b0cd63f754b2171b73e4d845c0950d407 h: refs/heads/master i:   36287:
 f5b8816628b06d56cc334414bb1639b9bfcaf849 v: v3

---
 [refs]                                                          | 2 +-
 trunk/arch/sh/boards/renesas/rts7751r2d/setup.c                 | 2 +-
 trunk/arch/sh/cchips/voyagergx/irq.c                            | 2 +-
 trunk/arch/sh/cchips/voyagergx/setup.c                          | 2 +-
 .../include/asm-sh/{rts7751r2d/voyagergx_reg.h => voyagergx.h}  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename trunk/include/asm-sh/{rts7751r2d/voyagergx_reg.h => voyagergx.h} (99%)

diff --git a/[refs] b/[refs]
index f97ea80f69c2..f3bcdc931ad5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b565680d16300acab0ff167e24f0ea289a6bd5d
+refs/heads/master: adf1890b0cd63f754b2171b73e4d845c0950d407
diff --git a/trunk/arch/sh/boards/renesas/rts7751r2d/setup.c b/trunk/arch/sh/boards/renesas/rts7751r2d/setup.c
index f6ce7021feba..bb56c018f2ee 100644
--- a/trunk/arch/sh/boards/renesas/rts7751r2d/setup.c
+++ b/trunk/arch/sh/boards/renesas/rts7751r2d/setup.c
@@ -14,7 +14,7 @@
 #include <linux/pm.h>
 #include <asm/io.h>
 #include <asm/mach/rts7751r2d.h>
-#include <asm/mach/voyagergx_reg.h>
+#include <asm/voyagergx.h>
 
 static struct plat_serial8250_port uart_platform_data[] = {
 	{
diff --git a/trunk/arch/sh/cchips/voyagergx/irq.c b/trunk/arch/sh/cchips/voyagergx/irq.c
index 036e8f900013..4cfa7c990553 100644
--- a/trunk/arch/sh/cchips/voyagergx/irq.c
+++ b/trunk/arch/sh/cchips/voyagergx/irq.c
@@ -32,7 +32,7 @@
 
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/mach/voyagergx_reg.h>
+#include <asm/voyagergx.h>
 
 static void disable_voyagergx_irq(unsigned int irq)
 {
diff --git a/trunk/arch/sh/cchips/voyagergx/setup.c b/trunk/arch/sh/cchips/voyagergx/setup.c
index 3a4cfaa9a214..66b2fedd7ad9 100644
--- a/trunk/arch/sh/cchips/voyagergx/setup.c
+++ b/trunk/arch/sh/cchips/voyagergx/setup.c
@@ -13,7 +13,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <asm/io.h>
-#include <asm/mach/voyagergx_reg.h>
+#include <asm/voyagergx.h>
 
 static int __init setup_voyagergx(void)
 {
diff --git a/trunk/include/asm-sh/rts7751r2d/voyagergx_reg.h b/trunk/include/asm-sh/voyagergx.h
similarity index 99%
rename from trunk/include/asm-sh/rts7751r2d/voyagergx_reg.h
rename to trunk/include/asm-sh/voyagergx.h
index f031b5d6cf54..99b0807d1c9f 100644
--- a/trunk/include/asm-sh/rts7751r2d/voyagergx_reg.h
+++ b/trunk/include/asm-sh/voyagergx.h
@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------- */
-/* voyagergx_reg.h                                                      */
+/* voyagergx.h	                                                      */
 /* -------------------------------------------------------------------- */
 /*  This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by