Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c37abe5a authored by Olof Johansson's avatar Olof Johansson
Browse files

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: default avatarOlof Johansson <olof@lixom.net>
parents 1f6e3763 edd9d3cf
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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);
}