Commit 308a2bca authored by Stephen Hemminger's avatar Stephen Hemminger

[PATCH] (2/42) eepro

Patch from viro: NE26-eepro
	* switched eepro to dynamic allocation
	* eepro: embedded ->priv
	* eepro: fixed clobbering on autoprobe
	* eepro: fixed IO before request_region()
	* eepro: fixed resource leaks on failure exits
parent 4eb1b94b
...@@ -50,7 +50,7 @@ extern int ne_probe(struct net_device *dev); ...@@ -50,7 +50,7 @@ extern int ne_probe(struct net_device *dev);
extern int hp_probe(struct net_device *dev); extern int hp_probe(struct net_device *dev);
extern int hp_plus_probe(struct net_device *dev); extern int hp_plus_probe(struct net_device *dev);
extern int express_probe(struct net_device *); extern int express_probe(struct net_device *);
extern int eepro_probe(struct net_device *); extern struct net_device *eepro_probe(int unit);
extern int at1500_probe(struct net_device *); extern int at1500_probe(struct net_device *);
extern int at1700_probe(struct net_device *); extern int at1700_probe(struct net_device *);
extern int fmv18x_probe(struct net_device *); extern int fmv18x_probe(struct net_device *);
...@@ -252,14 +252,14 @@ static struct devprobe isa_probes[] __initdata = { ...@@ -252,14 +252,14 @@ static struct devprobe isa_probes[] __initdata = {
#endif #endif
#ifdef CONFIG_EEXPRESS /* Intel EtherExpress */ #ifdef CONFIG_EEXPRESS /* Intel EtherExpress */
{express_probe, 0}, {express_probe, 0},
#endif
#ifdef CONFIG_EEXPRESS_PRO /* Intel EtherExpress Pro/10 */
{eepro_probe, 0},
#endif #endif
{NULL, 0}, {NULL, 0},
}; };
static struct devprobe2 isa_probes2[] __initdata = { static struct devprobe2 isa_probes2[] __initdata = {
#ifdef CONFIG_EEXPRESS_PRO /* Intel EtherExpress Pro/10 */
{eepro_probe, 0},
#endif
#ifdef CONFIG_EWRK3 /* DEC EtherWORKS 3 */ #ifdef CONFIG_EWRK3 /* DEC EtherWORKS 3 */
{ewrk3_probe, 0}, {ewrk3_probe, 0},
#endif #endif
......
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