Commit 65e9e2db authored by Stephen Hemminger's avatar Stephen Hemminger

[PATCH] (05/12) Probe2 -- ni5010

from viro NE16-ni5010
	* switched ni5010 to dynamic allocation
	* ni5010: embedded ->priv
	* ni5010: fixed clobbering ->irq
	* ni5010: fixed IO before request_region()
Additional:
	* add free_netdev
parent a56fc3a9
...@@ -68,7 +68,7 @@ extern int ac3200_probe(struct net_device *); ...@@ -68,7 +68,7 @@ extern int ac3200_probe(struct net_device *);
extern int es_probe(struct net_device *); extern int es_probe(struct net_device *);
extern int lne390_probe(struct net_device *); extern int lne390_probe(struct net_device *);
extern int e2100_probe(struct net_device *); extern int e2100_probe(struct net_device *);
extern int ni5010_probe(struct net_device *); extern struct net_device *ni5010_probe(int unit);
extern struct net_device *ni52_probe(int unit); extern struct net_device *ni52_probe(int unit);
extern struct net_device *ni65_probe(int unit); extern struct net_device *ni65_probe(int unit);
extern int sonic_probe(struct net_device *); extern int sonic_probe(struct net_device *);
...@@ -279,14 +279,14 @@ static struct devprobe isa_probes[] __initdata = { ...@@ -279,14 +279,14 @@ static struct devprobe isa_probes[] __initdata = {
#endif #endif
#ifdef CONFIG_SK_G16 #ifdef CONFIG_SK_G16
{SK_init, 0}, {SK_init, 0},
#endif
#ifdef CONFIG_NI5010
{ni5010_probe, 0},
#endif #endif
{NULL, 0}, {NULL, 0},
}; };
static struct devprobe2 isa_probes2[] __initdata = { static struct devprobe2 isa_probes2[] __initdata = {
#ifdef CONFIG_NI5010
{ni5010_probe, 0},
#endif
#ifdef CONFIG_NI52 #ifdef CONFIG_NI52
{ni52_probe, 0}, {ni52_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