diff options
Diffstat (limited to 'drivers/net/Space.c')
-rw-r--r-- | drivers/net/Space.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/drivers/net/Space.c b/drivers/net/Space.c index 60304f7e7e5..9953201c670 100644 --- a/drivers/net/Space.c +++ b/drivers/net/Space.c | |||
@@ -18,7 +18,7 @@ | |||
18 | * - struct init cleanup, enable multiple ISA autoprobes. | 18 | * - struct init cleanup, enable multiple ISA autoprobes. |
19 | * Arnaldo Carvalho de Melo <acme@conectiva.com.br> - 09/1999 | 19 | * Arnaldo Carvalho de Melo <acme@conectiva.com.br> - 09/1999 |
20 | * - fix sbni: s/device/net_device/ | 20 | * - fix sbni: s/device/net_device/ |
21 | * Paul Gortmaker (06/98): | 21 | * Paul Gortmaker (06/98): |
22 | * - sort probes in a sane way, make sure all (safe) probes | 22 | * - sort probes in a sane way, make sure all (safe) probes |
23 | * get run once & failed autoprobes don't autoprobe again. | 23 | * get run once & failed autoprobes don't autoprobe again. |
24 | * | 24 | * |
@@ -27,7 +27,6 @@ | |||
27 | * as published by the Free Software Foundation; either version | 27 | * as published by the Free Software Foundation; either version |
28 | * 2 of the License, or (at your option) any later version. | 28 | * 2 of the License, or (at your option) any later version. |
29 | */ | 29 | */ |
30 | #include <linux/config.h> | ||
31 | #include <linux/netdevice.h> | 30 | #include <linux/netdevice.h> |
32 | #include <linux/etherdevice.h> | 31 | #include <linux/etherdevice.h> |
33 | #include <linux/trdevice.h> | 32 | #include <linux/trdevice.h> |
@@ -92,7 +91,7 @@ extern struct net_device *mac89x0_probe(int unit); | |||
92 | extern struct net_device *mc32_probe(int unit); | 91 | extern struct net_device *mc32_probe(int unit); |
93 | extern struct net_device *cops_probe(int unit); | 92 | extern struct net_device *cops_probe(int unit); |
94 | extern struct net_device *ltpc_probe(void); | 93 | extern struct net_device *ltpc_probe(void); |
95 | 94 | ||
96 | /* Detachable devices ("pocket adaptors") */ | 95 | /* Detachable devices ("pocket adaptors") */ |
97 | extern struct net_device *de620_probe(int unit); | 96 | extern struct net_device *de620_probe(int unit); |
98 | 97 | ||
@@ -130,10 +129,10 @@ static int __init probe_list2(int unit, struct devprobe2 *p, int autoprobe) | |||
130 | */ | 129 | */ |
131 | 130 | ||
132 | static struct devprobe2 eisa_probes[] __initdata = { | 131 | static struct devprobe2 eisa_probes[] __initdata = { |
133 | #ifdef CONFIG_ULTRA32 | 132 | #ifdef CONFIG_ULTRA32 |
134 | {ultra32_probe, 0}, | 133 | {ultra32_probe, 0}, |
135 | #endif | 134 | #endif |
136 | #ifdef CONFIG_AC3200 | 135 | #ifdef CONFIG_AC3200 |
137 | {ac3200_probe, 0}, | 136 | {ac3200_probe, 0}, |
138 | #endif | 137 | #endif |
139 | #ifdef CONFIG_ES3210 | 138 | #ifdef CONFIG_ES3210 |
@@ -168,14 +167,14 @@ static struct devprobe2 mca_probes[] __initdata = { | |||
168 | static struct devprobe2 isa_probes[] __initdata = { | 167 | static struct devprobe2 isa_probes[] __initdata = { |
169 | #ifdef CONFIG_HP100 /* ISA, EISA & PCI */ | 168 | #ifdef CONFIG_HP100 /* ISA, EISA & PCI */ |
170 | {hp100_probe, 0}, | 169 | {hp100_probe, 0}, |
171 | #endif | 170 | #endif |
172 | #ifdef CONFIG_3C515 | 171 | #ifdef CONFIG_3C515 |
173 | {tc515_probe, 0}, | 172 | {tc515_probe, 0}, |
174 | #endif | 173 | #endif |
175 | #ifdef CONFIG_ULTRA | 174 | #ifdef CONFIG_ULTRA |
176 | {ultra_probe, 0}, | 175 | {ultra_probe, 0}, |
177 | #endif | 176 | #endif |
178 | #ifdef CONFIG_WD80x3 | 177 | #ifdef CONFIG_WD80x3 |
179 | {wd_probe, 0}, | 178 | {wd_probe, 0}, |
180 | #endif | 179 | #endif |
181 | #ifdef CONFIG_EL2 /* 3c503 */ | 180 | #ifdef CONFIG_EL2 /* 3c503 */ |
@@ -200,7 +199,7 @@ static struct devprobe2 isa_probes[] __initdata = { | |||
200 | #ifdef CONFIG_SMC9194 | 199 | #ifdef CONFIG_SMC9194 |
201 | {smc_init, 0}, | 200 | {smc_init, 0}, |
202 | #endif | 201 | #endif |
203 | #ifdef CONFIG_SEEQ8005 | 202 | #ifdef CONFIG_SEEQ8005 |
204 | {seeq8005_probe, 0}, | 203 | {seeq8005_probe, 0}, |
205 | #endif | 204 | #endif |
206 | #ifdef CONFIG_CS89x0 | 205 | #ifdef CONFIG_CS89x0 |
@@ -296,7 +295,7 @@ static struct devprobe2 m68k_probes[] __initdata = { | |||
296 | * Unified ethernet device probe, segmented per architecture and | 295 | * Unified ethernet device probe, segmented per architecture and |
297 | * per bus interface. This drives the legacy devices only for now. | 296 | * per bus interface. This drives the legacy devices only for now. |
298 | */ | 297 | */ |
299 | 298 | ||
300 | static void __init ethif_probe2(int unit) | 299 | static void __init ethif_probe2(int unit) |
301 | { | 300 | { |
302 | unsigned long base_addr = netdev_boot_base("eth", unit); | 301 | unsigned long base_addr = netdev_boot_base("eth", unit); |
@@ -350,7 +349,7 @@ static void __init trif_probe2(int unit) | |||
350 | } | 349 | } |
351 | #endif | 350 | #endif |
352 | 351 | ||
353 | 352 | ||
354 | /* | 353 | /* |
355 | * The loopback device is global so it can be directly referenced | 354 | * The loopback device is global so it can be directly referenced |
356 | * by the network code. Also, it must be first on device list. | 355 | * by the network code. Also, it must be first on device list. |
@@ -366,7 +365,7 @@ static int __init net_olddevs_init(void) | |||
366 | printk(KERN_ERR "Network loopback device setup failed\n"); | 365 | printk(KERN_ERR "Network loopback device setup failed\n"); |
367 | } | 366 | } |
368 | 367 | ||
369 | 368 | ||
370 | #ifdef CONFIG_SBNI | 369 | #ifdef CONFIG_SBNI |
371 | for (num = 0; num < 8; ++num) | 370 | for (num = 0; num < 8; ++num) |
372 | sbni_probe(num); | 371 | sbni_probe(num); |