diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
| commit | 545f435ebcfd94a1e7c20b46efe81b4d6ac4e698 (patch) | |
| tree | e9ce4bc598d06374bda906f18365984bf22a526a /drivers/net/Space.c | |
| parent | 4291a610eef89d0d5c69d9a10ee6560e1aa36c74 (diff) | |
Merge with Linux 2.1.55. More bugfixes and goodies from my private
CVS archive.
Diffstat (limited to 'drivers/net/Space.c')
| -rw-r--r-- | drivers/net/Space.c | 36 |
1 files changed, 23 insertions, 13 deletions
diff --git a/drivers/net/Space.c b/drivers/net/Space.c index 64bc62c41..4fdfbb6b1 100644 --- a/drivers/net/Space.c +++ b/drivers/net/Space.c @@ -32,6 +32,8 @@ #include <linux/errno.h> #include <linux/init.h> +#include <net/netlink.h> + #define NEXT_DEV NULL @@ -63,15 +65,14 @@ extern int apricot_probe(struct device *); extern int ewrk3_probe(struct device *); extern int de4x5_probe(struct device *); extern int el1_probe(struct device *); -#if defined(CONFIG_WAVELAN) extern int wavelan_probe(struct device *); -#endif /* defined(CONFIG_WAVELAN) */ extern int el16_probe(struct device *); extern int elmc_probe(struct device *); extern int elplus_probe(struct device *); extern int ac3200_probe(struct device *); extern int es_probe(struct device *); extern int e2100_probe(struct device *); +extern int ni5010_probe(struct device *); extern int ni52_probe(struct device *); extern int ni65_probe(struct device *); extern int sonic_probe(struct device *); @@ -90,7 +91,9 @@ extern int a2065_probe(struct device *); extern int ariadne_probe(struct device *); extern int hydra_probe(struct device *); extern int tlan_probe(struct device *); +extern int mace_probe(struct device *); extern int cs89x0_probe(struct device *dev); +extern int ethertap_probe(struct device *dev); /* Detachable devices ("pocket adaptors") */ extern int atp_init(struct device *); @@ -105,6 +108,12 @@ __initfunc(static int ethif_probe(struct device *dev)) return 1; /* ENXIO */ if (1 +#ifdef CONFIG_HAPPYMEAL + /* Please keep this one first, we'd like the on-board ethernet + * to be probed first before other PCI cards on Ultra/PCI. -DaveM + */ + && happy_meal_probe(dev) +#endif #ifdef CONFIG_DGRS && dgrs_probe(dev) #endif @@ -222,6 +231,9 @@ __initfunc(static int ethif_probe(struct device *dev)) #if defined(CONFIG_SK_G16) && SK_init(dev) #endif +#ifdef CONFIG_NI5010 + && ni5010_probe(dev) +#endif #ifdef CONFIG_NI52 && ni52_probe(dev) #endif @@ -246,15 +258,15 @@ __initfunc(static int ethif_probe(struct device *dev)) #ifdef CONFIG_TLAN && tlan_probe(dev) #endif -#ifdef CONFIG_HAPPYMEAL - && happy_meal_probe(dev) -#endif #ifdef CONFIG_SUNQE && qec_probe(dev) #endif #ifdef CONFIG_MYRI_SBUS && myri_sbus_probe(dev) #endif +#ifdef CONFIG_MACE + && mace_probe(dev) +#endif #ifdef CONFIG_SGISEEQ && sgiseeq_probe(dev) #endif @@ -270,6 +282,12 @@ __initfunc(static int ethif_probe(struct device *dev)) +#ifdef CONFIG_ETHERTAP + static struct device tap0_dev = { "tap0", 0, 0, 0, 0, NETLINK_TAPBASE, 0, 0, 0, 0, NEXT_DEV, ethertap_probe, }; +# undef NEXT_DEV +# define NEXT_DEV (&tap0_dev) +#endif + #ifdef CONFIG_SDLA extern int sdla_init(struct device *); static struct device sdla0_dev = { "sdla0", 0, 0, 0, 0, 0, 0, 0, 0, 0, NEXT_DEV, sdla_init, }; @@ -286,14 +304,6 @@ static struct device atp_dev = { # define NEXT_DEV (&atp_dev) #endif -#ifdef CONFIG_ARCNET - extern int arcnet_probe(struct device *dev); - static struct device arcnet_dev = { - "arc0", 0x0, 0x0, 0x0, 0x0, 0, 0, 0, 0, 0, NEXT_DEV, arcnet_probe, }; -# undef NEXT_DEV -# define NEXT_DEV (&arcnet_dev) -#endif - #if defined(CONFIG_LTPC) extern int ltpc_probe(struct device *); static struct device dev_ltpc = { |