Merge git://git.infradead.org/battery-2.6

[sfrench/cifs-2.6.git] / drivers / spi / orion_spi.c

diff --git a/drivers/spi/orion_spi.c b/drivers/spi/orion_spi.c
index 014becb7d53007b20099b9b9c84d0eb09d19e5dc..c8b0babdc2a6f346466cf90a9eed21e261be6e68 100644 (file)
--- a/drivers/spi/orion_spi.c
+++ b/drivers/spi/orion_spi.c
@@ -496,7 +496,7 @@ static int __init orion_spi_probe(struct platform_device *pdev)
        }
 
        if (!request_mem_region(r->start, (r->end - r->start) + 1,
-                               pdev->dev.bus_id)) {
+                               dev_name(&pdev->dev))) {
                status = -EBUSY;
                goto out;
        }