projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64...
[deliverable/linux.git]
/
drivers
/
watchdog
/
qcom-wdt.c
diff --git
a/drivers/watchdog/qcom-wdt.c
b/drivers/watchdog/qcom-wdt.c
index 424f9a952fee41d1a95332c3ae4f7682876fef2d..20563ccb7be0f5400c1166b0895adc73da758f30 100644
(file)
--- a/
drivers/watchdog/qcom-wdt.c
+++ b/
drivers/watchdog/qcom-wdt.c
@@
-70,7
+70,8
@@
static int qcom_wdt_set_timeout(struct watchdog_device *wdd,
return qcom_wdt_start(wdd);
}
-static int qcom_wdt_restart(struct watchdog_device *wdd)
+static int qcom_wdt_restart(struct watchdog_device *wdd, unsigned long action,
+ void *data)
{
struct qcom_wdt *wdt = to_qcom_wdt(wdd);
u32 timeout;
This page took
0.030365 seconds
and
5
git commands to generate.