Merge remote-tracking branch 'spi/topic/pl022' into spi-next

This commit is contained in:
Mark Brown 2013-10-25 09:51:35 +01:00
commit 7e0ae74090
1 changed files with 2 additions and 2 deletions

View File

@ -2173,8 +2173,8 @@ static int pl022_probe(struct amba_device *adev, const struct amba_id *id)
status = -ENOMEM;
goto err_no_ioremap;
}
printk(KERN_INFO "pl022: mapped registers from %pa to %p\n",
&adev->res.start, pl022->virtbase);
dev_info(&adev->dev, "mapped registers from %pa to %p\n",
&adev->res.start, pl022->virtbase);
pl022->clk = devm_clk_get(&adev->dev, NULL);
if (IS_ERR(pl022->clk)) {