diff options
author | Stefan Agner <stefan@agner.ch> | 2014-10-06 16:25:21 +0200 |
---|---|---|
committer | Stefan Agner <stefan@agner.ch> | 2014-10-06 16:25:21 +0200 |
commit | c646b0f4fdad4cc9dabdcbe40b5a893d173e2850 (patch) | |
tree | 246e0d7bc48137f2d176ad126cebd275a60b6833 /drivers/parisc/dino.c | |
parent | 4ce237b369eb9513c090d3c97e0c06c5a33f0cf7 (diff) | |
parent | bfe01a5ba2490f299e1d2d5508cbbbadd897bbe9 (diff) |
Merge tag 'v3.17' into toradex_vf_3.17-next
Linux 3.17
Conflicts:
Documentation/devicetree/bindings/usb/mxs-phy.txt
drivers/usb/phy/phy-mxs-usb.c
Diffstat (limited to 'drivers/parisc/dino.c')
-rw-r--r-- | drivers/parisc/dino.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c index 9eae9834bcc7..a0580afe1713 100644 --- a/drivers/parisc/dino.c +++ b/drivers/parisc/dino.c @@ -913,7 +913,7 @@ static int __init dino_probe(struct parisc_device *dev) printk("%s version %s found at 0x%lx\n", name, version, hpa); if (!request_mem_region(hpa, PAGE_SIZE, name)) { - printk(KERN_ERR "DINO: Hey! Someone took my MMIO space (0x%ld)!\n", + printk(KERN_ERR "DINO: Hey! Someone took my MMIO space (0x%lx)!\n", hpa); return 1; } |