diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-10-30 19:39:02 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-10-30 19:39:02 +0100 |
| commit | 31271e9aacaa3c3460cbad8ec62fb5a04a522f5b (patch) | |
| tree | 815c671dac14e0e07959dc88e94c36a994f9c460 /drivers/net/ethernet/freescale/gianfar_ptp.c | |
| parent | Merge tag 'spi-linus' into spi-next (diff) | |
| parent | spi: tegra: add spi driver for SLINK controller (diff) | |
| download | linux-31271e9aacaa3c3460cbad8ec62fb5a04a522f5b.tar.xz linux-31271e9aacaa3c3460cbad8ec62fb5a04a522f5b.zip | |
Merge branch 'spi-tegra' into spi-next
Diffstat (limited to 'drivers/net/ethernet/freescale/gianfar_ptp.c')
| -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) pr_err("no resource\n"); goto no_resource; } - if (request_resource(&ioport_resource, etsects->rsrc)) { + if (request_resource(&iomem_resource, etsects->rsrc)) { pr_err("resource busy\n"); goto no_resource; } |