From d1f4bd037338f27e740e498ef049f7964045f4b4 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Wed, 7 Jun 2006 12:53:17 +0100
Subject: [PATCH] --- yaml --- r: 27647 b: refs/heads/master c:
 aac076f8805448a6331a526aa02cc438730ddd39 h: refs/heads/master i:   27645:
 78b3b9beb8142b5843acce0aac4e6ece2018200b   27643:
 a32eed870347a4d4fc95883acb9a97019aea2daa   27639:
 b9dfda96ae4b3dd1b008d26ad7bb11add63a775d   27631:
 b56c11cda0dd9ee1c3b57513973451b746eabfb4   27615:
 575de8de45ec530f381fa43033da6dbec852f82a   27583:
 2a31ae40876bec025d6a534177cde3d9c02fd737   27519:
 d77e717084c7af42717d5405674c2de8db958eac   27391:
 ce7729081e65ac1df3131aaa9d1b16fc148ae2ff   27135:
 6a70082c469bc9a564fe730c5d1b0297d4e05541   26623:
 944cb629fbf5931edec5b916c13733c72d9bda63 v: v3

---
 [refs]                  | 2 +-
 trunk/arch/mips/Kconfig | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 55cb94d43f45..0be352f4f361 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 973c789742b4dc957cd7feb96cae98988dd0cf01
+refs/heads/master: aac076f8805448a6331a526aa02cc438730ddd39
diff --git a/trunk/arch/mips/Kconfig b/trunk/arch/mips/Kconfig
index e8ff09fe73d9..80d7ce9e1f94 100644
--- a/trunk/arch/mips/Kconfig
+++ b/trunk/arch/mips/Kconfig
@@ -555,6 +555,7 @@ config SGI_IP22
 	select HW_HAS_EISA
 	select IP22_CPU_SCACHE
 	select IRQ_CPU
+	select NO_ISA if ISA
 	select SWAP_IO_SPACE
 	select SYS_HAS_CPU_R4X00
 	select SYS_HAS_CPU_R5000
@@ -1710,6 +1711,9 @@ source "drivers/pci/Kconfig"
 config ISA
 	bool
 
+config NO_ISA
+	bool
+
 config EISA
 	bool "EISA support"
 	depends on HW_HAS_EISA