diff options
author | Mark Brown <broonie@linaro.org> | 2013-09-01 13:49:04 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-09-01 13:49:04 +0100 |
commit | 720ed2d130e321635976009884e3aeb5ef4f152d (patch) | |
tree | bbdac2981dc1e8fffde4654dee3881870be99023 /drivers/spi/spi-pl022.c | |
parent | 68aa4cb3374a5f47fe1f7b31e0b5893826c05c69 (diff) | |
parent | 7085f403517615c8dc209972d134a9336de1db45 (diff) | |
download | linux-stable-720ed2d130e321635976009884e3aeb5ef4f152d.tar.gz linux-stable-720ed2d130e321635976009884e3aeb5ef4f152d.tar.bz2 linux-stable-720ed2d130e321635976009884e3aeb5ef4f152d.zip |
Merge remote-tracking branch 'spi/topic/pl022' into spi-next
Diffstat (limited to 'drivers/spi/spi-pl022.c')
-rw-r--r-- | drivers/spi/spi-pl022.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c index 4b564b74c99c..5a9e05e20bb5 100644 --- a/drivers/spi/spi-pl022.c +++ b/drivers/spi/spi-pl022.c @@ -2194,8 +2194,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 0x%08x to %p\n", - adev->res.start, pl022->virtbase); + printk(KERN_INFO "pl022: 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)) { |