aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/Space.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/Space.c')
-rw-r--r--drivers/net/Space.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/Space.c b/drivers/net/Space.c
index a8c245a82261..9953201c670d 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 *
@@ -91,7 +91,7 @@ extern struct net_device *mac89x0_probe(int unit);
91extern struct net_device *mc32_probe(int unit); 91extern struct net_device *mc32_probe(int unit);
92extern struct net_device *cops_probe(int unit); 92extern struct net_device *cops_probe(int unit);
93extern struct net_device *ltpc_probe(void); 93extern struct net_device *ltpc_probe(void);
94 94
95/* Detachable devices ("pocket adaptors") */ 95/* Detachable devices ("pocket adaptors") */
96extern struct net_device *de620_probe(int unit); 96extern struct net_device *de620_probe(int unit);
97 97
@@ -129,10 +129,10 @@ static int __init probe_list2(int unit, struct devprobe2 *p, int autoprobe)
129 */ 129 */
130 130
131static struct devprobe2 eisa_probes[] __initdata = { 131static struct devprobe2 eisa_probes[] __initdata = {
132#ifdef CONFIG_ULTRA32 132#ifdef CONFIG_ULTRA32
133 {ultra32_probe, 0}, 133 {ultra32_probe, 0},
134#endif 134#endif
135#ifdef CONFIG_AC3200 135#ifdef CONFIG_AC3200
136 {ac3200_probe, 0}, 136 {ac3200_probe, 0},
137#endif 137#endif
138#ifdef CONFIG_ES3210 138#ifdef CONFIG_ES3210
@@ -167,14 +167,14 @@ static struct devprobe2 mca_probes[] __initdata = {
167static struct devprobe2 isa_probes[] __initdata = { 167static struct devprobe2 isa_probes[] __initdata = {
168#ifdef CONFIG_HP100 /* ISA, EISA & PCI */ 168#ifdef CONFIG_HP100 /* ISA, EISA & PCI */
169 {hp100_probe, 0}, 169 {hp100_probe, 0},
170#endif 170#endif
171#ifdef CONFIG_3C515 171#ifdef CONFIG_3C515
172 {tc515_probe, 0}, 172 {tc515_probe, 0},
173#endif 173#endif
174#ifdef CONFIG_ULTRA 174#ifdef CONFIG_ULTRA
175 {ultra_probe, 0}, 175 {ultra_probe, 0},
176#endif 176#endif
177#ifdef CONFIG_WD80x3 177#ifdef CONFIG_WD80x3
178 {wd_probe, 0}, 178 {wd_probe, 0},
179#endif 179#endif
180#ifdef CONFIG_EL2 /* 3c503 */ 180#ifdef CONFIG_EL2 /* 3c503 */
@@ -199,7 +199,7 @@ static struct devprobe2 isa_probes[] __initdata = {
199#ifdef CONFIG_SMC9194 199#ifdef CONFIG_SMC9194
200 {smc_init, 0}, 200 {smc_init, 0},
201#endif 201#endif
202#ifdef CONFIG_SEEQ8005 202#ifdef CONFIG_SEEQ8005
203 {seeq8005_probe, 0}, 203 {seeq8005_probe, 0},
204#endif 204#endif
205#ifdef CONFIG_CS89x0 205#ifdef CONFIG_CS89x0
@@ -295,7 +295,7 @@ static struct devprobe2 m68k_probes[] __initdata = {
295 * Unified ethernet device probe, segmented per architecture and 295 * Unified ethernet device probe, segmented per architecture and
296 * per bus interface. This drives the legacy devices only for now. 296 * per bus interface. This drives the legacy devices only for now.
297 */ 297 */
298 298
299static void __init ethif_probe2(int unit) 299static void __init ethif_probe2(int unit)
300{ 300{
301 unsigned long base_addr = netdev_boot_base("eth", unit); 301 unsigned long base_addr = netdev_boot_base("eth", unit);
@@ -349,7 +349,7 @@ static void __init trif_probe2(int unit)
349} 349}
350#endif 350#endif
351 351
352 352
353/* 353/*
354 * The loopback device is global so it can be directly referenced 354 * The loopback device is global so it can be directly referenced
355 * 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.
@@ -365,7 +365,7 @@ static int __init net_olddevs_init(void)
365 printk(KERN_ERR "Network loopback device setup failed\n"); 365 printk(KERN_ERR "Network loopback device setup failed\n");
366 } 366 }
367 367
368 368
369#ifdef CONFIG_SBNI 369#ifdef CONFIG_SBNI
370 for (num = 0; num < 8; ++num) 370 for (num = 0; num < 8; ++num)
371 sbni_probe(num); 371 sbni_probe(num);