Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 93853fd0d492524e9172297d8e8b8364dc2c4c59

Authored by Alexey Dobriyan
Committed by David S. Miller
1 parent 96ba989d22
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[SUNLANCE]: fix compilation on sparc-UP 

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 4 additions and 4 deletions Side-by-side Diff

drivers/net/sunlance.c
Diff comments   View file @ 93853fd
... ... @@ -1537,7 +1537,7 @@
1537 1537 {
1538 1538 if ((idprom->id_machtype == (SM_SUN4|SM_4_330)) ||
1539 1539 (idprom->id_machtype == (SM_SUN4|SM_4_470))) {
1540   - memset(&sun4_sdev, 0, sizeof(sdev));
  1540 + memset(&sun4_sdev, 0, sizeof(struct sbus_dev));
1541 1541 sun4_sdev.reg_addrs[0].phys_addr = sun4_eth_physaddr;
1542 1542 sun4_sdev.irqs[0] = 6;
1543 1543 return sparc_lance_probe_one(&sun4_sdev, NULL, NULL);
1544 1544  
1545 1545  
... ... @@ -1547,16 +1547,16 @@
1547 1547  
1548 1548 static int __exit sunlance_sun4_remove(void)
1549 1549 {
1550   - struct lance_private *lp = dev_get_drvdata(&sun4_sdev->dev);
  1550 + struct lance_private *lp = dev_get_drvdata(&sun4_sdev.ofdev.dev);
1551 1551 struct net_device *net_dev = lp->dev;
1552 1552  
1553 1553 unregister_netdevice(net_dev);
1554 1554  
1555   - lance_free_hwresources(root_lance_dev);
  1555 + lance_free_hwresources(lp);
1556 1556  
1557 1557 free_netdev(net_dev);
1558 1558  
1559   - dev_set_drvdata(&sun4_sdev->dev, NULL);
  1559 + dev_set_drvdata(&sun4_sdev.ofdev.dev, NULL);
1560 1560  
1561 1561 return 0;
1562 1562 }