diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-11-13 16:25:38 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-11-13 16:25:38 -0500 |
| commit | 89ab216b33ba9405880fd3d89531305a931bc70f (patch) | |
| tree | 8f6428ce51ecaed6f6e1379c036dbe341eb71e34 /drivers/net/ethernet/freescale | |
| parent | c9d501e5cb0238910337213e12a09127221c35d8 (diff) | |
| parent | 46bf4a562207c5ebd24e1dde5e5ee326cd3d6b91 (diff) | |
Merge branch 'omap-for-v3.8/pm' into omap-for-v3.8/clock
Diffstat (limited to 'drivers/net/ethernet/freescale')
| -rw-r--r-- | drivers/net/ethernet/freescale/gianfar_ptp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/freescale/gianfar_ptp.c b/drivers/net/ethernet/freescale/gianfar_ptp.c index b9db0e040563..2e5daee0438a 100644 --- a/drivers/net/ethernet/freescale/gianfar_ptp.c +++ b/drivers/net/ethernet/freescale/gianfar_ptp.c | |||
| @@ -478,7 +478,7 @@ static int gianfar_ptp_probe(struct platform_device *dev) | |||
| 478 | pr_err("no resource\n"); | 478 | pr_err("no resource\n"); |
| 479 | goto no_resource; | 479 | goto no_resource; |
| 480 | } | 480 | } |
| 481 | if (request_resource(&ioport_resource, etsects->rsrc)) { | 481 | if (request_resource(&iomem_resource, etsects->rsrc)) { |
| 482 | pr_err("resource busy\n"); | 482 | pr_err("resource busy\n"); |
| 483 | goto no_resource; | 483 | goto no_resource; |
| 484 | } | 484 | } |