summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-03-17 00:49:36 -0700
committerOlof Johansson <olof@lixom.net>2014-03-17 00:49:36 -0700
commit56f55deb6e95664a7b17aa95baf60e51773f2153 (patch)
tree663c39c93e940cbd4667e7ad79bd0d41a921154a
parent4664f3d339db54680ac0dbc488dc1ff74d91ac8b (diff)
parent56ff873122c4baab43df241c7701d043b8ec8a8e (diff)
downloadop-kernel-dev-56f55deb6e95664a7b17aa95baf60e51773f2153.zip
op-kernel-dev-56f55deb6e95664a7b17aa95baf60e51773f2153.tar.gz
Merge tag 'renesas-soc3-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
Merge "Third Round of Renesas ARM Based SoC Updates for v3.15" from Simon Horman: Fix warnings due to improper printk formats in shared APMU code. * tag 'renesas-soc3-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: APMU: Fix warnings due to improper printk formats Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r--arch/arm/mach-shmobile/platsmp-apmu.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/platsmp-apmu.c b/arch/arm/mach-shmobile/platsmp-apmu.c
index 1da5a72..8cb641c 100644
--- a/arch/arm/mach-shmobile/platsmp-apmu.c
+++ b/arch/arm/mach-shmobile/platsmp-apmu.c
@@ -75,8 +75,7 @@ static void apmu_init_cpu(struct resource *res, int cpu, int bit)
apmu_cpus[cpu].iomem = ioremap_nocache(res->start, resource_size(res));
apmu_cpus[cpu].bit = bit;
- pr_debug("apmu ioremap %d %d 0x%08x 0x%08x\n", cpu, bit,
- res->start, resource_size(res));
+ pr_debug("apmu ioremap %d %d %pr\n", cpu, bit, res);
}
static struct {
OpenPOWER on IntegriCloud