git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'origin' into devel
[pandora-kernel.git]
/
drivers
/
spi
/
omap2_mcspi.c
diff --git
a/drivers/spi/omap2_mcspi.c
b/drivers/spi/omap2_mcspi.c
index
b91ee1a
..
d6d0c5d
100644
(file)
--- 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)
goto err1;
}
if (!request_mem_region(r->start, (r->end - r->start) + 1,
-
pdev->dev.bus_id
)) {
+
dev_name(&pdev->dev)
)) {
status = -EBUSY;
goto err1;
}