projects
/
platform
/
kernel
/
linux-starfive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 's390-5.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
[platform/kernel/linux-starfive.git]
/
arch
/
sh
/
drivers
/
heartbeat.c
diff --git
a/arch/sh/drivers/heartbeat.c
b/arch/sh/drivers/heartbeat.c
index
cf2fccc
..
24391b4
100644
(file)
--- a/
arch/sh/drivers/heartbeat.c
+++ b/
arch/sh/drivers/heartbeat.c
@@
-96,7
+96,7
@@
static int heartbeat_drv_probe(struct platform_device *pdev)
return -ENOMEM;
}
- hd->base = ioremap
_nocache
(res->start, resource_size(res));
+ hd->base = ioremap(res->start, resource_size(res));
if (unlikely(!hd->base)) {
dev_err(&pdev->dev, "ioremap failed\n");