From 3a89d59d7728d47364d364b408602facc5ac99b0 Mon Sep 17 00:00:00 2001
From: Thiemo Seufer <ths@networkno.de>
Date: Fri, 8 Jul 2005 07:36:51 +0000
Subject: [PATCH] --- yaml --- r: 11135 b: refs/heads/master c:
 4552074577c639da32dd58a617ea11ac3e28912b h: refs/heads/master i:   11133:
 c6565914c440e7d8d9342fa087a2a0965c8d3154   11131:
 d7580a60b5f1732182b2880785a7df9f99d1ba33   11127:
 3cc52c4eefb819cffa60f4b453159319a21fe1bd   11119:
 abdb6f20277e193335404b659fed2580e57ec75f   11103:
 87b7f75a7f75ec58488e98f4a928cf446de377e4   11071:
 1822b53fc8b37e32774ce9a10a35d7796404c92e   11007:
 52697f9c2b089b35479e1870a72a08b76b61cf04 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/mips/arc/identify.c    | 5 +++++
 trunk/include/asm-mips/bootinfo.h | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3ccbbf00166f..165fd94ee33b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85f14bf2cb084990970f897463dea66182d28acf
+refs/heads/master: 4552074577c639da32dd58a617ea11ac3e28912b
diff --git a/trunk/arch/mips/arc/identify.c b/trunk/arch/mips/arc/identify.c
index 0dd7a345eb79..1bd6199e174a 100644
--- a/trunk/arch/mips/arc/identify.c
+++ b/trunk/arch/mips/arc/identify.c
@@ -44,6 +44,11 @@ static struct smatch mach_table[] = {
 		MACH_GROUP_SGI,
 		MACH_SGI_IP28,
 		PROM_FLAG_ARCS
+	}, {	"SGI-IP30",
+		"SGI Octane",
+		MACH_GROUP_SGI,
+		MACH_SGI_IP30,
+		PROM_FLAG_ARCS
 	}, {	"SGI-IP32",
 		"SGI O2",
 		MACH_GROUP_SGI,
diff --git a/trunk/include/asm-mips/bootinfo.h b/trunk/include/asm-mips/bootinfo.h
index 404856e6b82d..e5c03c525bda 100644
--- a/trunk/include/asm-mips/bootinfo.h
+++ b/trunk/include/asm-mips/bootinfo.h
@@ -77,6 +77,7 @@
 #define  MACH_SGI_IP27		1	/* Origin 200, Origin 2000, Onyx 2 */
 #define  MACH_SGI_IP28		2	/* Indigo2 Impact		*/
 #define  MACH_SGI_IP32		3	/* O2				*/
+#define  MACH_SGI_IP30		4	/* Octane, Octane2              */
 
 /*
  * Valid machtype for group COBALT