]>
Commit | Line | Data |
---|---|---|
12f2d15d | 1 | diff -urN linux-2.6.0-test3-bk/arch/i386/kernel/i386_ksyms.c linux/arch/i386/kernel/i386_ksyms.c |
2 | --- linux-2.6.0-test3-bk/arch/i386/kernel/i386_ksyms.c 2003-07-27 13:11:42.000000000 -0400 | |
3 | +++ linux/arch/i386/kernel/i386_ksyms.c 2003-08-12 07:58:01.268653760 -0400 | |
4 | @@ -62,9 +62,6 @@ | |
5 | ||
6 | /* platform dependent support */ | |
7 | EXPORT_SYMBOL(boot_cpu_data); | |
8 | -#ifdef CONFIG_EISA | |
9 | -EXPORT_SYMBOL(EISA_bus); | |
10 | -#endif | |
11 | EXPORT_SYMBOL(MCA_bus); | |
12 | #ifdef CONFIG_DISCONTIGMEM | |
13 | EXPORT_SYMBOL(node_data); | |
14 | diff -urN linux-2.6.0-test3-bk/arch/i386/kernel/traps.c linux/arch/i386/kernel/traps.c | |
15 | --- linux-2.6.0-test3-bk/arch/i386/kernel/traps.c 2003-07-27 12:57:49.000000000 -0400 | |
16 | +++ linux/arch/i386/kernel/traps.c 2003-08-12 07:58:01.273653000 -0400 | |
17 | @@ -829,11 +829,6 @@ | |
18 | _set_gate(idt_table+n,5,0,0,(gdt_entry<<3)); | |
19 | } | |
20 | ||
21 | - | |
22 | -#ifdef CONFIG_EISA | |
23 | -int EISA_bus; | |
24 | -#endif | |
25 | - | |
26 | void __init trap_init(void) | |
27 | { | |
28 | #ifdef CONFIG_EISA | |
29 | diff -urN linux-2.6.0-test3-bk/arch/mips/kernel/mips_ksyms.c linux/arch/mips/kernel/mips_ksyms.c | |
30 | --- linux-2.6.0-test3-bk/arch/mips/kernel/mips_ksyms.c 2003-08-09 02:49:56.000000000 -0400 | |
31 | +++ linux/arch/mips/kernel/mips_ksyms.c 2003-08-12 07:58:01.285651176 -0400 | |
32 | @@ -43,10 +43,6 @@ | |
33 | ||
34 | EXPORT_SYMBOL(mips_machtype); | |
35 | ||
36 | -#ifdef CONFIG_EISA | |
37 | -EXPORT_SYMBOL(EISA_bus); | |
38 | -#endif | |
39 | - | |
40 | /* | |
41 | * String functions | |
42 | */ | |
43 | diff -urN linux-2.6.0-test3-bk/arch/mips/kernel/setup.c linux/arch/mips/kernel/setup.c | |
44 | --- linux-2.6.0-test3-bk/arch/mips/kernel/setup.c 2003-08-09 02:49:56.000000000 -0400 | |
45 | +++ linux/arch/mips/kernel/setup.c 2003-08-12 07:58:01.291650264 -0400 | |
46 | @@ -44,15 +44,6 @@ | |
47 | struct screen_info screen_info; | |
48 | #endif | |
49 | ||
50 | -/* | |
51 | - * Set if box has EISA slots. | |
52 | - */ | |
53 | -#ifdef CONFIG_EISA | |
54 | -int EISA_bus; | |
55 | - | |
56 | -EXPORT_SYMBOL(EISA_bus); | |
57 | -#endif | |
58 | - | |
59 | #if defined(CONFIG_BLK_DEV_FD) || defined(CONFIG_BLK_DEV_FD_MODULE) | |
60 | extern struct fd_ops no_fd_ops; | |
61 | struct fd_ops *fd_ops; | |
62 | diff -urN linux-2.6.0-test3-bk/arch/parisc/kernel/parisc_ksyms.c linux/arch/parisc/kernel/parisc_ksyms.c | |
63 | --- linux-2.6.0-test3-bk/arch/parisc/kernel/parisc_ksyms.c 2003-07-27 13:11:56.000000000 -0400 | |
64 | +++ linux/arch/parisc/kernel/parisc_ksyms.c 2003-08-12 07:58:01.301648744 -0400 | |
65 | @@ -41,9 +41,6 @@ | |
66 | #include <asm/processor.h> | |
67 | EXPORT_SYMBOL(kernel_thread); | |
68 | EXPORT_SYMBOL(boot_cpu_data); | |
69 | -#ifdef CONFIG_EISA | |
70 | -EXPORT_SYMBOL(EISA_bus); | |
71 | -#endif | |
72 | ||
73 | #include <linux/pm.h> | |
74 | EXPORT_SYMBOL(pm_power_off); | |
75 | diff -urN linux-2.6.0-test3-bk/arch/parisc/kernel/setup.c linux/arch/parisc/kernel/setup.c | |
76 | --- linux-2.6.0-test3-bk/arch/parisc/kernel/setup.c 2003-07-27 13:10:24.000000000 -0400 | |
77 | +++ linux/arch/parisc/kernel/setup.c 2003-08-12 07:58:01.306647984 -0400 | |
78 | @@ -52,10 +52,6 @@ | |
79 | struct proc_dir_entry * proc_runway_root = NULL; | |
80 | struct proc_dir_entry * proc_gsc_root = NULL; | |
81 | ||
82 | -#ifdef CONFIG_EISA | |
83 | -int EISA_bus; /* This has to go somewhere in architecture specific code. */ | |
84 | -#endif | |
85 | - | |
86 | void __init setup_cmdline(char **cmdline_p) | |
87 | { | |
88 | extern unsigned int boot_args[]; | |
89 | diff -urN linux-2.6.0-test3-bk/drivers/eisa/eisa-bus.c linux/drivers/eisa/eisa-bus.c | |
90 | --- linux-2.6.0-test3-bk/drivers/eisa/eisa-bus.c 2003-07-27 12:59:37.000000000 -0400 | |
91 | +++ linux/drivers/eisa/eisa-bus.c 2003-08-12 07:58:01.317646312 -0400 | |
92 | @@ -15,6 +15,12 @@ | |
93 | #include <linux/slab.h> | |
94 | #include <linux/ioport.h> | |
95 | #include <asm/io.h> | |
96 | +#include <asm/processor.h> /* for EISA_bus define */ | |
97 | + | |
98 | +#ifndef EISA_bus | |
99 | +int EISA_bus; | |
100 | +EXPORT_SYMBOL(EISA_bus); | |
101 | +#endif | |
102 | ||
103 | #define SLOT_ADDRESS(r,n) (r->bus_base_addr + (0x1000 * n)) | |
104 | ||
105 |