projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Pull battery into release branch
[firefly-linux-kernel-4.4.55.git]
/
arch
/
sh
/
drivers
/
heartbeat.c
diff --git
a/arch/sh/drivers/heartbeat.c
b/arch/sh/drivers/heartbeat.c
index 23dd6080422f155cdb422b7f373e2964eedf41d6..10c1828c9ff51b5fbd3cf5d104153ef77fb40afd 100644
(file)
--- a/
arch/sh/drivers/heartbeat.c
+++ b/
arch/sh/drivers/heartbeat.c
@@
-78,7
+78,7
@@
static int heartbeat_drv_probe(struct platform_device *pdev)
hd->bit_pos[i] = i;
}
- hd->base = (void __iomem *)res->start;
+ hd->base = (void __iomem *)
(unsigned long)
res->start;
setup_timer(&hd->timer, heartbeat_timer, (unsigned long)hd);
platform_set_drvdata(pdev, hd);