Skip to content

Commit

Permalink
Merge tag 'mvebu-watchdog-3.15-2' of git://git.infradead.org/linux-mv…
Browse files Browse the repository at this point in the history
…ebu 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 <[email protected]>
  • Loading branch information
olofj committed Mar 9, 2014
2 parents 1f6e376 + edd9d3c commit c37abe5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/watchdog/orion_wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down

0 comments on commit c37abe5

Please sign in to comment.