Commit a866edc8 authored by Jeff Garzik's avatar Jeff Garzik

Merge new sun3 82586 net driver from 2.4.x.

parent d56ec794
...@@ -154,6 +154,7 @@ obj-$(CONFIG_DE600) += de600.o ...@@ -154,6 +154,7 @@ obj-$(CONFIG_DE600) += de600.o
obj-$(CONFIG_DE620) += de620.o obj-$(CONFIG_DE620) += de620.o
obj-$(CONFIG_AT1500) += lance.o obj-$(CONFIG_AT1500) += lance.o
obj-$(CONFIG_LANCE) += lance.o obj-$(CONFIG_LANCE) += lance.o
obj-$(CONFIG_SUN3_82586) += sun3_82586.o
obj-$(CONFIG_SUN3LANCE) += sun3lance.o obj-$(CONFIG_SUN3LANCE) += sun3lance.o
obj-$(CONFIG_DEFXX) += defxx.o obj-$(CONFIG_DEFXX) += defxx.o
obj-$(CONFIG_SGISEEQ) += sgiseeq.o obj-$(CONFIG_SGISEEQ) += sgiseeq.o
......
...@@ -88,6 +88,7 @@ extern int smc_init( struct net_device * ); ...@@ -88,6 +88,7 @@ extern int smc_init( struct net_device * );
extern int sgiseeq_probe(struct net_device *); extern int sgiseeq_probe(struct net_device *);
extern int atarilance_probe(struct net_device *); extern int atarilance_probe(struct net_device *);
extern int sun3lance_probe(struct net_device *); extern int sun3lance_probe(struct net_device *);
extern int sun3_82586_probe(struct net_device *);
extern int apne_probe(struct net_device *); extern int apne_probe(struct net_device *);
extern int bionet_probe(struct net_device *); extern int bionet_probe(struct net_device *);
extern int pamsnet_probe(struct net_device *); extern int pamsnet_probe(struct net_device *);
...@@ -334,6 +335,9 @@ static struct devprobe m68k_probes[] __initdata = { ...@@ -334,6 +335,9 @@ static struct devprobe m68k_probes[] __initdata = {
#ifdef CONFIG_SUN3LANCE /* sun3 onboard Lance chip */ #ifdef CONFIG_SUN3LANCE /* sun3 onboard Lance chip */
{sun3lance_probe, 0}, {sun3lance_probe, 0},
#endif #endif
#ifdef CONFIG_SUN3_82586 /* sun3 onboard Intel 82586 chip */
{sun3_82586_probe, 0},
#endif
#ifdef CONFIG_APNE /* A1200 PCMCIA NE2000 */ #ifdef CONFIG_APNE /* A1200 PCMCIA NE2000 */
{apne_probe, 0}, {apne_probe, 0},
#endif #endif
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment