diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
| commit | ed40d0c472b136682b2fcba05f89762859c7374f (patch) | |
| tree | 076b83a26bcd63d6158463735dd34c10bbc591dc /drivers/spi/omap2_mcspi.c | |
| parent | 9e495834e59ca9b29f1a1f63b9f5533bb022ac49 (diff) | |
| parent | 5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a (diff) | |
Merge branch 'origin' into devel
Conflicts:
sound/soc/pxa/pxa2xx-i2s.c
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 b91ee1ae975d..d6d0c5d241ce 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 | } |