Merge commit 'origin/master' into next

Manual merge of:
	arch/powerpc/include/asm/elf.h
	drivers/i2c/busses/i2c-mpc.c

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/spi/omap2_mcspi.c b/drivers/spi/omap2_mcspi.c
index 454a2712e629..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)
                 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;
         }
@@ -1021,13 +1021,13 @@ static int __init omap2_mcspi_probe(struct platform_device *pdev)
         spin_lock_init(&mcspi->lock);
         INIT_LIST_HEAD(&mcspi->msg_queue);
 
-        mcspi->ick = clk_get(&pdev->dev, "mcspi_ick");
+        mcspi->ick = clk_get(&pdev->dev, "ick");
         if (IS_ERR(mcspi->ick)) {
                 dev_dbg(&pdev->dev, "can't get mcspi_ick\n");
                 status = PTR_ERR(mcspi->ick);
                 goto err1a;
         }
-        mcspi->fck = clk_get(&pdev->dev, "mcspi_fck");
+        mcspi->fck = clk_get(&pdev->dev, "fck");
         if (IS_ERR(mcspi->fck)) {
                 dev_dbg(&pdev->dev, "can't get mcspi_fck\n");
                 status = PTR_ERR(mcspi->fck);