diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-28 19:24:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-28 19:24:38 -0700 |
| commit | 9d22e6d7ad50472da399a500bf039e7718a6cdc9 (patch) | |
| tree | e3b69a31ca755d33ec86e52bbac5e883c59d6daf /drivers | |
| parent | 159099dc3d501f8a39a169125c476f9b25182610 (diff) | |
| parent | 93853fd0d492524e9172297d8e8b8364dc2c4c59 (diff) | |
| download | kernel_samsung_smdk4412-9d22e6d7ad50472da399a500bf039e7718a6cdc9.zip kernel_samsung_smdk4412-9d22e6d7ad50472da399a500bf039e7718a6cdc9.tar.gz kernel_samsung_smdk4412-9d22e6d7ad50472da399a500bf039e7718a6cdc9.tar.bz2 | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SUNLANCE]: fix compilation on sparc-UP
[SPARC]: Defer clock_probe to fs_initcall()
[SPARC64]: Fix typo in pgprot_noncached().
[SPARC64]: Fix quad-float multiply emulation.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/sunlance.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c index 1ef9fd3..0e3fdf7 100644 --- a/drivers/net/sunlance.c +++ b/drivers/net/sunlance.c @@ -1537,7 +1537,7 @@ static int __init sparc_lance_init(void) { if ((idprom->id_machtype == (SM_SUN4|SM_4_330)) || (idprom->id_machtype == (SM_SUN4|SM_4_470))) { - memset(&sun4_sdev, 0, sizeof(sdev)); + memset(&sun4_sdev, 0, sizeof(struct sbus_dev)); sun4_sdev.reg_addrs[0].phys_addr = sun4_eth_physaddr; sun4_sdev.irqs[0] = 6; return sparc_lance_probe_one(&sun4_sdev, NULL, NULL); @@ -1547,16 +1547,16 @@ static int __init sparc_lance_init(void) static int __exit sunlance_sun4_remove(void) { - struct lance_private *lp = dev_get_drvdata(&sun4_sdev->dev); + struct lance_private *lp = dev_get_drvdata(&sun4_sdev.ofdev.dev); struct net_device *net_dev = lp->dev; unregister_netdevice(net_dev); - lance_free_hwresources(root_lance_dev); + lance_free_hwresources(lp); free_netdev(net_dev); - dev_set_drvdata(&sun4_sdev->dev, NULL); + dev_set_drvdata(&sun4_sdev.ofdev.dev, NULL); return 0; } |