sh: Move voyagergx_reg.h to a more sensible place.

Other boards require this as well, so move it out of the
rts7751r2d directory.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/boards/renesas/rts7751r2d/setup.c b/arch/sh/boards/renesas/rts7751r2d/setup.c
index f6ce7021feba70f75c195b5eb6b861dd95aed3e2..bb56c018f2eebc02988f8292bd4308ee601869d0 100644 (file)
--- a/arch/sh/boards/renesas/rts7751r2d/setup.c
+++ b/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/arch/sh/cchips/voyagergx/irq.c b/arch/sh/cchips/voyagergx/irq.c
index 036e8f9000138658db8b9658603015af91b1dd5a..4cfa7c9905537e3aaf5e5a23dcfb25e3d8c59d0b 100644 (file)
--- a/arch/sh/cchips/voyagergx/irq.c
+++ b/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/arch/sh/cchips/voyagergx/setup.c b/arch/sh/cchips/voyagergx/setup.c
index 3a4cfaa9a21409de768442d8d5ad411ac3a5c34e..66b2fedd7ad9308c53648116d56c317a15c3b533 100644 (file)
--- a/arch/sh/cchips/voyagergx/setup.c
+++ b/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/include/asm-sh/rts7751r2d/voyagergx_reg.h b/include/asm-sh/voyagergx.h
similarity index 99%
rename from include/asm-sh/rts7751r2d/voyagergx_reg.h
rename to include/asm-sh/voyagergx.h
index f031b5d6cf54b4681fd96366755afb661f56e2b7..99b0807d1c9f4806c1c51f3c4448fce433704828 100644 (file)
--- a/include/asm-sh/rts7751r2d/voyagergx_reg.h
+++ b/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