diff options
Diffstat (limited to 'drivers/net/sunlance.c')
-rw-r--r-- | drivers/net/sunlance.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c index 386af7bbe67..7d9c33dd9d1 100644 --- a/drivers/net/sunlance.c +++ b/drivers/net/sunlance.c | |||
@@ -1323,7 +1323,7 @@ static int __devinit sparc_lance_probe_one(struct of_device *op, | |||
1323 | struct of_device *ledma, | 1323 | struct of_device *ledma, |
1324 | struct of_device *lebuffer) | 1324 | struct of_device *lebuffer) |
1325 | { | 1325 | { |
1326 | struct device_node *dp = op->node; | 1326 | struct device_node *dp = op->dev.of_node; |
1327 | static unsigned version_printed; | 1327 | static unsigned version_printed; |
1328 | struct lance_private *lp; | 1328 | struct lance_private *lp; |
1329 | struct net_device *dev; | 1329 | struct net_device *dev; |
@@ -1410,7 +1410,7 @@ static int __devinit sparc_lance_probe_one(struct of_device *op, | |||
1410 | 1410 | ||
1411 | lp->burst_sizes = 0; | 1411 | lp->burst_sizes = 0; |
1412 | if (lp->ledma) { | 1412 | if (lp->ledma) { |
1413 | struct device_node *ledma_dp = ledma->node; | 1413 | struct device_node *ledma_dp = ledma->dev.of_node; |
1414 | struct device_node *sbus_dp; | 1414 | struct device_node *sbus_dp; |
1415 | unsigned int sbmask; | 1415 | unsigned int sbmask; |
1416 | const char *prop; | 1416 | const char *prop; |
@@ -1506,7 +1506,7 @@ fail: | |||
1506 | static int __devinit sunlance_sbus_probe(struct of_device *op, const struct of_device_id *match) | 1506 | static int __devinit sunlance_sbus_probe(struct of_device *op, const struct of_device_id *match) |
1507 | { | 1507 | { |
1508 | struct of_device *parent = to_of_device(op->dev.parent); | 1508 | struct of_device *parent = to_of_device(op->dev.parent); |
1509 | struct device_node *parent_dp = parent->node; | 1509 | struct device_node *parent_dp = parent->dev.of_node; |
1510 | int err; | 1510 | int err; |
1511 | 1511 | ||
1512 | if (!strcmp(parent_dp->name, "ledma")) { | 1512 | if (!strcmp(parent_dp->name, "ledma")) { |
@@ -1545,8 +1545,11 @@ static const struct of_device_id sunlance_sbus_match[] = { | |||
1545 | MODULE_DEVICE_TABLE(of, sunlance_sbus_match); | 1545 | MODULE_DEVICE_TABLE(of, sunlance_sbus_match); |
1546 | 1546 | ||
1547 | static struct of_platform_driver sunlance_sbus_driver = { | 1547 | static struct of_platform_driver sunlance_sbus_driver = { |
1548 | .name = "sunlance", | 1548 | .driver = { |
1549 | .match_table = sunlance_sbus_match, | 1549 | .name = "sunlance", |
1550 | .owner = THIS_MODULE, | ||
1551 | .of_match_table = sunlance_sbus_match, | ||
1552 | }, | ||
1550 | .probe = sunlance_sbus_probe, | 1553 | .probe = sunlance_sbus_probe, |
1551 | .remove = __devexit_p(sunlance_sbus_remove), | 1554 | .remove = __devexit_p(sunlance_sbus_remove), |
1552 | }; | 1555 | }; |