diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-11 13:40:56 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-11 13:40:56 +0200 |
| commit | 251a169c69d1ff07cee7a9bb9fc4faff6b1d2ac3 (patch) | |
| tree | 3c20c3e080f276848f2ad67aadab44a5d64bfda9 /drivers/net/wd.c | |
| parent | 6679ce6e5f519096612b480d255d9ca97be0c2be (diff) | |
| parent | 796aadeb1b2db9b5d463946766c5bbfd7717158c (diff) | |
| download | lwn-251a169c69d1ff07cee7a9bb9fc4faff6b1d2ac3.tar.gz lwn-251a169c69d1ff07cee7a9bb9fc4faff6b1d2ac3.zip | |
Merge branch 'linus' into sched/urgent
Diffstat (limited to 'drivers/net/wd.c')
| -rw-r--r-- | drivers/net/wd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wd.c b/drivers/net/wd.c index fa14255282af..6f9aa1643743 100644 --- a/drivers/net/wd.c +++ b/drivers/net/wd.c @@ -337,7 +337,7 @@ static int __init wd_probe1(struct net_device *dev, int ioaddr) #ifdef CONFIG_NET_POLL_CONTROLLER dev->poll_controller = ei_poll; #endif - NS8390_init(dev, 0); + NS8390p_init(dev, 0); #if 1 /* Enable interrupt generation on softconfig cards -- M.U */ |