[parisc-linux-cvs] DIFF -pa72

[Grant Grundler]

Export EISA_bus when CONFIG_EISA is defined.

I'm having second thoughts that wrapping EISA_bus with 
with #ifdef CONFIG_EISA was a good idea.
Makes distributing binary driver modules slightly harder
for no good reason I can think of. ie people (like me)
who don't define CONFIG_EISA won't be able to use binaries
(driver modules) delivered from someone who does.
If someone feels strongly about that, I won't be offended
(and might be convinced to do it myself) if they back it out.

grant


Index: Makefile
===================================================================
RCS file: /var/cvs/linux/Makefile,v
retrieving revision 1.183
diff -u -p -r1.183 Makefile
--- Makefile	2001/10/24 22:28:47	1.183
+++ Makefile	2001/10/27 06:29:50
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 4
 SUBLEVEL = 9
-EXTRAVERSION = -pa71
+EXTRAVERSION = -pa72
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
Index: include/asm-parisc/processor.h
===================================================================
RCS file: /var/cvs/linux/include/asm-parisc/processor.h,v
retrieving revision 1.48
diff -u -p -r1.48 processor.h
--- include/asm-parisc/processor.h	2001/10/04 11:05:49	1.48
+++ include/asm-parisc/processor.h	2001/10/27 06:29:50
@@ -98,7 +98,11 @@ extern struct cpuinfo_parisc cpu_data[NR
 
 #define CPU_HVERSION ((boot_cpu_data.hversion >> 4) & 0x0FFF)
 
+#ifdef CONFIG_EISA
 extern int EISA_bus;
+#else
+#define EISA_bus 0
+#endif
 
 #define MCA_bus 0
 #define MCA_bus__is_a_macro /* for versions in ksyms.c */
Index: arch/parisc/kernel/setup.c
===================================================================
RCS file: /var/cvs/linux/arch/parisc/kernel/setup.c,v
retrieving revision 1.94
diff -u -p -r1.94 setup.c
--- arch/parisc/kernel/setup.c	2001/10/23 06:41:31	1.94
+++ arch/parisc/kernel/setup.c	2001/10/27 06:29:50
@@ -50,9 +50,9 @@ char	command_line[COMMAND_LINE_SIZE];
 struct proc_dir_entry * proc_runway_root = NULL;
 struct proc_dir_entry * proc_gsc_root = NULL;
 
-
-/* This has to go somewhere in architecture specific code. */
-int EISA_bus;
+#ifdef CONFIG_EISA
+int EISA_bus;	/* This has to go somewhere in architecture specific code. */
+#endif
 
 void __init setup_cmdline(char **cmdline_p)
 {
Index: arch/parisc/kernel/parisc_ksyms.c
===================================================================
RCS file: /var/cvs/linux/arch/parisc/kernel/parisc_ksyms.c,v
retrieving revision 1.28
diff -u -p -r1.28 parisc_ksyms.c
--- arch/parisc/kernel/parisc_ksyms.c	2001/10/17 20:02:27	1.28
+++ arch/parisc/kernel/parisc_ksyms.c	2001/10/27 06:29:50
@@ -38,6 +38,9 @@ EXPORT_SYMBOL(disable_irq);
 #include <asm/processor.h>
 EXPORT_SYMBOL(kernel_thread);
 EXPORT_SYMBOL(boot_cpu_data);
+#ifdef CONFIG_EISA
+EXPORT_SYMBOL(EISA_bus);
+#endif
 
 #include <linux/pm.h>
 EXPORT_SYMBOL(pm_power_off);