diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
| commit | 86464aed71025541805e7b1515541aee89879e33 (patch) | |
| tree | e01a457a4912a8553bc65524aa3125d51f29f810 /drivers/net/Space.c | |
| parent | 88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff) | |
Merge with Linux 2.2.1.
Diffstat (limited to 'drivers/net/Space.c')
| -rw-r--r-- | drivers/net/Space.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/drivers/net/Space.c b/drivers/net/Space.c index a3f8e68a9..eece1bfe3 100644 --- a/drivers/net/Space.c +++ b/drivers/net/Space.c @@ -111,6 +111,8 @@ extern int rtl8139_probe(struct device *dev); extern int hplance_probe(struct device *dev); extern int via_rhine_probe(struct device *dev); extern int tc515_probe(struct device *dev); +extern int lance_probe(struct device *dev); +extern int rcpci_probe(struct device *); /* Gigabit Ethernet adapters */ extern int yellowfin_probe(struct device *dev); @@ -126,7 +128,6 @@ extern int dfx_probe(struct device *dev); extern int apfddi_init(struct device *dev); /* HIPPI boards */ -extern int cern_hippi_probe(struct device *); extern int rr_hippi_probe(struct device *); struct devprobe @@ -172,12 +173,12 @@ struct devprobe pci_probes[] __initdata = { #ifdef CONFIG_DGRS {dgrs_probe, 0}, #endif +#ifdef CONFIG_RCPCI + {rcpci_probe, 0}, +#endif #ifdef CONFIG_VORTEX {tc59x_probe, 0}, #endif -#ifdef CONFIG_DEC_ELCP - {tulip_probe, 0}, -#endif #ifdef CONFIG_NE2K_PCI {ne2k_pci_probe, 0}, #endif @@ -187,6 +188,9 @@ struct devprobe pci_probes[] __initdata = { #ifdef CONFIG_EEXPRESS_PRO100 /* Intel EtherExpress Pro/100 */ {eepro100_probe, 0}, #endif +#ifdef CONFIG_DEC_ELCP + {tulip_probe, 0}, +#endif #ifdef CONFIG_DE4X5 /* DEC DE425, DE434, DE435 adapters */ {de4x5_probe, 0}, #endif @@ -300,6 +304,9 @@ struct devprobe isa_probes[] __initdata = { #ifdef CONFIG_NE2000 /* ISA (use ne2k-pci for PCI cards) */ {ne_probe, 0}, #endif +#ifdef CONFIG_LANCE /* ISA/VLB (use pcnet32 for PCI cards) */ + {lance_probe, 0}, +#endif #ifdef CONFIG_SMC9194 {smc_init, 0}, #endif @@ -536,9 +543,6 @@ static int hippi_probe(struct device *dev) return 1; if (1 -#ifdef CONFIG_CERN_HIPPI - && cern_hippi_probe(dev) -#endif #ifdef CONFIG_ROADRUNNER && rr_hippi_probe(dev) #endif @@ -713,6 +717,9 @@ trif_probe(struct device *dev) #ifdef CONFIG_SKTR && sktr_probe(dev) #endif +#ifdef CONFIG_SMCTR + && smctr_probe(dev) +#endif && 1 ) { return 1; /* -ENODEV or -EAGAIN would be more accurate. */ } |