diff options
| author | Matthew Wilcox <willy@debian.org> | 2003-09-20 20:20:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2003-09-20 20:20:02 -0700 |
| commit | 972b4a74dcacecc9ae50fa46daa10d4efcaef4d1 (patch) | |
| tree | 7df8c5dc5563327e164529b96f17b0d3a78e7361 /arch/parisc/kernel | |
| parent | 87a6ea5a476f8add51faa6ac422be9b6875f4e9d (diff) | |
[PATCH] Move EISA_bus
When I change the setting of CONFIG_EISA, everything rebuilds. This is
because EISA_bus is declared in <asm/processor.h> which is implicitly
included by just about everything. This is a silly place to declare it,
so this patch moves it to include/linux/eisa.h.
While I'm at it, I also move the variable definition to
drivers/eisa/eisa-bus.c. The rest of this patch is fixing up the fallout
from having to include <linux/eisa.h> if you use EISA_bus.
Diffstat (limited to 'arch/parisc/kernel')
| -rw-r--r-- | arch/parisc/kernel/irq.c | 3 | ||||
| -rw-r--r-- | arch/parisc/kernel/parisc_ksyms.c | 3 | ||||
| -rw-r--r-- | arch/parisc/kernel/pci.c | 1 | ||||
| -rw-r--r-- | arch/parisc/kernel/setup.c | 4 |
4 files changed, 3 insertions, 8 deletions
diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c index 9d3a97a5b0bb..eafb849da3a0 100644 --- a/arch/parisc/kernel/irq.c +++ b/arch/parisc/kernel/irq.c @@ -22,7 +22,7 @@ */ #include <linux/bitops.h> #include <linux/config.h> -#include <asm/pdc.h> +#include <linux/eisa.h> #include <linux/errno.h> #include <linux/init.h> #include <linux/signal.h> @@ -39,6 +39,7 @@ #include <linux/spinlock.h> #include <asm/cache.h> +#include <asm/pdc.h> #undef DEBUG_IRQ #undef PARISC_IRQ_CR16_COUNTS diff --git a/arch/parisc/kernel/parisc_ksyms.c b/arch/parisc/kernel/parisc_ksyms.c index 4a16af09be6d..f6d87e4d7575 100644 --- a/arch/parisc/kernel/parisc_ksyms.c +++ b/arch/parisc/kernel/parisc_ksyms.c @@ -42,9 +42,6 @@ EXPORT_SYMBOL(probe_irq_mask); #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); diff --git a/arch/parisc/kernel/pci.c b/arch/parisc/kernel/pci.c index 1e299167edfc..189a6ae02bb9 100644 --- a/arch/parisc/kernel/pci.c +++ b/arch/parisc/kernel/pci.c @@ -10,6 +10,7 @@ * Copyright (C) 1999-2001 Grant Grundler */ #include <linux/config.h> +#include <linux/eisa.h> #include <linux/init.h> #include <linux/module.h> #include <linux/kernel.h> diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c index 5dde472c50fc..42f74c99072b 100644 --- a/arch/parisc/kernel/setup.c +++ b/arch/parisc/kernel/setup.c @@ -52,10 +52,6 @@ char command_line[COMMAND_LINE_SIZE]; struct proc_dir_entry * proc_runway_root = NULL; struct proc_dir_entry * proc_gsc_root = NULL; -#ifdef CONFIG_EISA -int EISA_bus; /* This has to go somewhere in architecture specific code. */ -#endif - void __init setup_cmdline(char **cmdline_p) { extern unsigned int boot_args[]; |