---

yaml --- r: 27647 b: refs/heads/master c: aac076f h: refs/heads/master i: 27645: 78b3b9b 27643: a32eed8 27639: b9dfda9 27631: b56c11c 27615: 575de8d 27583: 2a31ae4 27519: d77e717 27391: ce77290 27135: 6a70082 26623: 944cb62 v: v3
git-mirror · Jun 19, 2006 · d1f4bd0 · d1f4bd0
1 parent 3919cda
commit d1f4bd0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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