From 0a121bbd264605f4ea51ed371efb4403ad3d7033 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Wed, 18 Jan 2006 23:26:43 +0000
Subject: [PATCH] --- yaml --- r: 19889 b: refs/heads/master c:
 11ed6d5bb01c5f347fd5c47e0005f06687c66f1f h: refs/heads/master i:   19887:
 420f77c6d83b2e092a22f86b8781722dc5440202 v: v3

---
 [refs]                                                        | 2 +-
 trunk/arch/mips/Makefile                                      | 2 +-
 trunk/arch/mips/cobalt/int-handler.S                          | 2 +-
 trunk/arch/mips/cobalt/irq.c                                  | 2 +-
 trunk/arch/mips/cobalt/reset.c                                | 2 +-
 trunk/arch/mips/cobalt/setup.c                                | 2 +-
 trunk/arch/mips/pci/fixup-cobalt.c                            | 2 +-
 trunk/arch/mips/pci/ops-gt64111.c                             | 2 +-
 trunk/include/asm-mips/{cobalt => mach-cobalt}/cobalt.h       | 0
 trunk/include/asm-mips/{cobalt => mach-cobalt}/mach-gt64120.h | 0
 10 files changed, 8 insertions(+), 8 deletions(-)
 rename trunk/include/asm-mips/{cobalt => mach-cobalt}/cobalt.h (100%)
 rename trunk/include/asm-mips/{cobalt => mach-cobalt}/mach-gt64120.h (100%)

diff --git a/[refs] b/[refs]
index fbc9699cb50f..458d848bf87e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fcdb27ad1d5c66611d3df6400a9b559186f266fe
+refs/heads/master: 11ed6d5bb01c5f347fd5c47e0005f06687c66f1f
diff --git a/trunk/arch/mips/Makefile b/trunk/arch/mips/Makefile
index 2a9f2ef27b29..9b53c59b269a 100644
--- a/trunk/arch/mips/Makefile
+++ b/trunk/arch/mips/Makefile
@@ -369,7 +369,7 @@ load-$(CONFIG_MIPS_XXS1500)	+= 0xffffffff80100000
 # Cobalt Server
 #
 core-$(CONFIG_MIPS_COBALT)	+= arch/mips/cobalt/
-cflags-$(CONFIG_MIPS_COBALT)	+= -Iinclude/asm-mips/cobalt
+cflags-$(CONFIG_MIPS_COBALT)	+= -Iinclude/asm-mips/mach-cobalt
 load-$(CONFIG_MIPS_COBALT)	+= 0xffffffff80080000
 
 #
diff --git a/trunk/arch/mips/cobalt/int-handler.S b/trunk/arch/mips/cobalt/int-handler.S
index f92608e8d84f..e75d5e3ca868 100644
--- a/trunk/arch/mips/cobalt/int-handler.S
+++ b/trunk/arch/mips/cobalt/int-handler.S
@@ -8,7 +8,7 @@
  */
 #include <asm/asm.h>
 #include <asm/mipsregs.h>
-#include <asm/cobalt/cobalt.h>
+#include <asm/mach-cobalt/cobalt.h>
 #include <asm/regdef.h>
 #include <asm/stackframe.h>
 
diff --git a/trunk/arch/mips/cobalt/irq.c b/trunk/arch/mips/cobalt/irq.c
index 0d90851f925e..f9a108820d6e 100644
--- a/trunk/arch/mips/cobalt/irq.c
+++ b/trunk/arch/mips/cobalt/irq.c
@@ -18,7 +18,7 @@
 #include <asm/gt64120.h>
 #include <asm/ptrace.h>
 
-#include <asm/cobalt/cobalt.h>
+#include <asm/mach-cobalt/cobalt.h>
 
 extern void cobalt_handle_int(void);
 
diff --git a/trunk/arch/mips/cobalt/reset.c b/trunk/arch/mips/cobalt/reset.c
index 805a0e88507b..753dfccae6fa 100644
--- a/trunk/arch/mips/cobalt/reset.c
+++ b/trunk/arch/mips/cobalt/reset.c
@@ -16,7 +16,7 @@
 #include <asm/reboot.h>
 #include <asm/system.h>
 #include <asm/mipsregs.h>
-#include <asm/cobalt/cobalt.h>
+#include <asm/mach-cobalt/cobalt.h>
 
 void cobalt_machine_halt(void)
 {
diff --git a/trunk/arch/mips/cobalt/setup.c b/trunk/arch/mips/cobalt/setup.c
index f9cf1554b234..050685b87a3c 100644
--- a/trunk/arch/mips/cobalt/setup.c
+++ b/trunk/arch/mips/cobalt/setup.c
@@ -26,7 +26,7 @@
 #include <asm/gt64120.h>
 #include <asm/serial.h>
 
-#include <asm/cobalt/cobalt.h>
+#include <asm/mach-cobalt/cobalt.h>
 
 extern void cobalt_machine_restart(char *command);
 extern void cobalt_machine_halt(void);
diff --git a/trunk/arch/mips/pci/fixup-cobalt.c b/trunk/arch/mips/pci/fixup-cobalt.c
index 909292f50d06..b664df150a3e 100644
--- a/trunk/arch/mips/pci/fixup-cobalt.c
+++ b/trunk/arch/mips/pci/fixup-cobalt.c
@@ -17,7 +17,7 @@
 #include <asm/io.h>
 #include <asm/gt64120.h>
 
-#include <asm/cobalt/cobalt.h>
+#include <asm/mach-cobalt/cobalt.h>
 
 extern int cobalt_board_id;
 
diff --git a/trunk/arch/mips/pci/ops-gt64111.c b/trunk/arch/mips/pci/ops-gt64111.c
index c1807934768d..13de45940b19 100644
--- a/trunk/arch/mips/pci/ops-gt64111.c
+++ b/trunk/arch/mips/pci/ops-gt64111.c
@@ -15,7 +15,7 @@
 #include <asm/io.h>
 #include <asm/gt64120.h>
 
-#include <asm/cobalt/cobalt.h>
+#include <asm/mach-cobalt/cobalt.h>
 
 /*
  * Device 31 on the GT64111 is used to generate PCI special
diff --git a/trunk/include/asm-mips/cobalt/cobalt.h b/trunk/include/asm-mips/mach-cobalt/cobalt.h
similarity index 100%
rename from trunk/include/asm-mips/cobalt/cobalt.h
rename to trunk/include/asm-mips/mach-cobalt/cobalt.h
diff --git a/trunk/include/asm-mips/cobalt/mach-gt64120.h b/trunk/include/asm-mips/mach-cobalt/mach-gt64120.h
similarity index 100%
rename from trunk/include/asm-mips/cobalt/mach-gt64120.h
rename to trunk/include/asm-mips/mach-cobalt/mach-gt64120.h