From 4788a63b5dfc9c7c40f025c913def75b9785d7ec Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Wed, 25 Jun 2003 12:08:46 +0000
Subject: [PATCH] Only assign to EISA_bus if EISA support is actually enabled. 
 Export EISA_bus from setup.c where it's defined.

---
 arch/mips/jazz/setup.c     | 2 ++
 arch/mips/kernel/setup.c   | 4 +++-
 arch/mips/sni/setup.c      | 6 ++++--
 arch/mips64/kernel/setup.c | 2 ++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c
index dec61414e10..aadaa904b0d 100644
--- a/arch/mips/jazz/setup.c
+++ b/arch/mips/jazz/setup.c
@@ -94,8 +94,10 @@ void __init jazz_setup(void)
 
 	irq_setup = jazz_irq_setup;
 	set_io_port_base(JAZZ_PORT_BASE);
+#ifdef CONFIG_EISA
 	if (mips_machtype == MACH_MIPS_MAGNUM_4000)
 		EISA_bus = 1;
+#endif
 	isa_slot_offset = 0xe3000000;
 	request_region(0x00,0x20,"dma1");
 	request_region(0x40,0x20,"timer");
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index 31203c79fb4..1ddafc0a6ac 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -53,7 +53,9 @@ struct cpuinfo_mips cpu_data[NR_CPUS];
  * This flag is set if a EISA slots are available.
  */
 #ifdef CONFIG_EISA
-int EISA_bus = 0;
+int EISA_bus;
+
+EXPORT_SYMBOL(EISA_bus);
 #endif
 
 struct screen_info screen_info;
diff --git a/arch/mips/sni/setup.c b/arch/mips/sni/setup.c
index e0c51a59445..4acde68fe94 100644
--- a/arch/mips/sni/setup.c
+++ b/arch/mips/sni/setup.c
@@ -5,9 +5,8 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 1996, 1997, 1998, 2000 by Ralf Baechle
+ * Copyright (C) 1996, 1997, 1998, 2000, 2003 by Ralf Baechle
  */
-#include <asm/ptrace.h>
 #include <linux/config.h>
 #include <linux/hdreg.h>
 #include <linux/ioport.h>
@@ -26,6 +25,7 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/processor.h>
+#include <asm/ptrace.h>
 #include <asm/reboot.h>
 #include <asm/sni.h>
 #include <asm/time.h>
@@ -84,7 +84,9 @@ void __init sni_rm200_pci_setup(void)
 	 */
 	isa_slot_offset = 0xb0000000;
 	// sni_map_isa_cache = 0;
+#ifdef CONFIG_EISA
 	EISA_bus = 1;
+#endif
 
 	request_region(0x00,0x20,"dma1");
 	request_region(0x40,0x20,"timer");
diff --git a/arch/mips64/kernel/setup.c b/arch/mips64/kernel/setup.c
index 2a18bbff48c..c159983d7e4 100644
--- a/arch/mips64/kernel/setup.c
+++ b/arch/mips64/kernel/setup.c
@@ -55,6 +55,8 @@ struct screen_info screen_info;
  */
 #ifdef CONFIG_EISA
 int EISA_bus = 0;
+
+EXPORT_SYMBOL(EISA_bus);
 #endif
 
 #ifdef CONFIG_BLK_DEV_FD
-- 
2.11.4.GIT