diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-27 20:19:16 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-27 20:19:16 -0400 |
| commit | a83398570e17af6bb81eb94f4f5dd356bd2828d8 (patch) | |
| tree | 5b5c7c3a56898485479291b7c964a1f3887d469c /drivers/spi/omap2_mcspi.c | |
| parent | f9384d41c02408dd404aa64d66d0ef38adcf6479 (diff) | |
| parent | 0b4d569de222452bcb55a4a536ade6cf4d8d1e30 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/spi/omap2_mcspi.c')
| -rw-r--r-- | drivers/spi/omap2_mcspi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/omap2_mcspi.c b/drivers/spi/omap2_mcspi.c index 454a2712e629..1c65e380c845 100644 --- a/drivers/spi/omap2_mcspi.c +++ b/drivers/spi/omap2_mcspi.c | |||
| @@ -1003,7 +1003,7 @@ static int __init omap2_mcspi_probe(struct platform_device *pdev) | |||
| 1003 | goto err1; | 1003 | goto err1; |
| 1004 | } | 1004 | } |
| 1005 | if (!request_mem_region(r->start, (r->end - r->start) + 1, | 1005 | if (!request_mem_region(r->start, (r->end - r->start) + 1, |
| 1006 | pdev->dev.bus_id)) { | 1006 | dev_name(&pdev->dev))) { |
| 1007 | status = -EBUSY; | 1007 | status = -EBUSY; |
| 1008 | goto err1; | 1008 | goto err1; |
| 1009 | } | 1009 | } |