From bdfbe8d502d03e24831d397cf2cea6b4ef96256c Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Sat, 10 Jun 2006 00:37:20 +0100
Subject: [PATCH] --- yaml --- r: 27670 b: refs/heads/master c:
 bf5a312b26e9943613b765a29a8de5f4c762df11 h: refs/heads/master v: v3

---
 [refs]                                             | 2 +-
 trunk/include/asm-mips/sn/{sn0/sn0_fru.h => fru.h} | 8 ++++----
 trunk/include/asm-mips/sn/klconfig.h               | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename trunk/include/asm-mips/sn/{sn0/sn0_fru.h => fru.h} (90%)

diff --git a/[refs] b/[refs]
index e262b9a7b214..1febe895be6a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8cb4e119f9a97f87f69a179d855f5dfc5d578c2
+refs/heads/master: bf5a312b26e9943613b765a29a8de5f4c762df11
diff --git a/trunk/include/asm-mips/sn/sn0/sn0_fru.h b/trunk/include/asm-mips/sn/fru.h
similarity index 90%
rename from trunk/include/asm-mips/sn/sn0/sn0_fru.h
rename to trunk/include/asm-mips/sn/fru.h
index 82c6377c275a..b3e3606723b7 100644
--- a/trunk/include/asm-mips/sn/sn0/sn0_fru.h
+++ b/trunk/include/asm-mips/sn/fru.h
@@ -6,10 +6,10 @@
  * Derived from IRIX <sys/SN/SN0/sn0_fru.h>
  *
  * Copyright (C) 1992 - 1997, 1999 Silcon Graphics, Inc.
- * Copyright (C) 1999 Ralf Baechle (ralf@gnu.org)
+ * Copyright (C) 1999, 2006 Ralf Baechle (ralf@linux-mips)
  */
-#ifndef _ASM_SN_SN0_SN0_FRU_H
-#define _ASM_SN_SN0_SN0_FRU_H
+#ifndef __ASM_SN_FRU_H
+#define __ASM_SN_FRU_H
 
 #define MAX_DIMMS			8	 /* max # of dimm banks */
 #define MAX_PCIDEV			8	 /* max # of pci devices on a pci bus */
@@ -41,4 +41,4 @@ typedef struct kf_pci_bus_s {
 	                                /* confidence level that the pci dev is bad */
 } kf_pci_bus_t;
 
-#endif /* _ASM_SN_SN0_SN0_FRU_H */
+#endif /* __ASM_SN_FRU_H */
diff --git a/trunk/include/asm-mips/sn/klconfig.h b/trunk/include/asm-mips/sn/klconfig.h
index 5deaf1cdadde..dc706268d2cf 100644
--- a/trunk/include/asm-mips/sn/klconfig.h
+++ b/trunk/include/asm-mips/sn/klconfig.h
@@ -37,7 +37,7 @@
 //#include <sys/SN/router.h>
 // XXX Stolen from <sys/SN/router.h>:
 #define MAX_ROUTER_PORTS (6)    /* Max. number of ports on a router */
-#include <asm/sn/sn0/sn0_fru.h>
+#include <asm/sn/fru.h>
 //#include <sys/graph.h>
 //#include <sys/xtalk/xbow.h>