summaryrefslogtreecommitdiff
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-03-09 06:03:58 (GMT)
committerOlof Johansson <olof@lixom.net>2014-03-09 07:22:03 (GMT)
commitc37abe5ad2607b163244ac4686debd6687d5b5aa (patch)
tree033a784d54687ad7b8a89a2bcbbd3f90f6caa234 /drivers/watchdog
parent1f6e3763d0480f3338b27ea04f66ff5c6e8d0f12 (diff)
parentedd9d3cffc90d4ed9b7b9d7d0645bd64a593c1d3 (diff)
downloadlinux-c37abe5ad2607b163244ac4686debd6687d5b5aa.tar.xz
Merge tag 'mvebu-watchdog-3.15-2' of git://git.infradead.org/linux-mvebu into next/drivers
mvebu watchdog driver changes for v3.15 (incremental #2) - remove warnings by using %pa for phys_addr_t * tag 'mvebu-watchdog-3.15-2' of git://git.infradead.org/linux-mvebu: watchdog: orion_wdt: Use %pa to print 'phys_addr_t' Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/orion_wdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
index 15321aa..6f9b4c6 100644
--- a/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c
@@ -269,7 +269,7 @@ static void __iomem *orion_wdt_ioremap_rstout(struct platform_device *pdev,
rstout = internal_regs + ORION_RSTOUT_MASK_OFFSET;
- WARN(1, FW_BUG "falling back to harcoded RSTOUT reg 0x%x\n", rstout);
+ WARN(1, FW_BUG "falling back to harcoded RSTOUT reg %pa\n", &rstout);
return devm_ioremap(&pdev->dev, rstout, 0x4);
}