Commit 56f55deb authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-soc3-for-v3.15' of...

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: default avatarOlof Johansson <olof@lixom.net>
parents 4664f3d3 56ff8731
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -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 {