summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/pika_wdt.c
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@datenfreihafen.org>2019-03-19 16:25:37 +0100
committerStefan Schmidt <stefan@datenfreihafen.org>2019-03-19 16:25:37 +0100
commit86008304dc2ad41a274cdacb585c641ec6bbb558 (patch)
tree7d8fdd6d9cbba05cebb7d36c4309ea2bb48e0af0 /drivers/watchdog/pika_wdt.c
parentieee802154: hwsim: propagate genlmsg_reply return code (diff)
parentDocumentation: networking: Update netdev-FAQ regarding patches (diff)
downloadlinux-86008304dc2ad41a274cdacb585c641ec6bbb558.tar.xz
linux-86008304dc2ad41a274cdacb585c641ec6bbb558.zip
Merge remote-tracking branch 'net/master'
Diffstat (limited to 'drivers/watchdog/pika_wdt.c')
-rw-r--r--drivers/watchdog/pika_wdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/pika_wdt.c b/drivers/watchdog/pika_wdt.c
index e0a6f8c0f03c..bb97f5b2f7eb 100644
--- a/drivers/watchdog/pika_wdt.c
+++ b/drivers/watchdog/pika_wdt.c
@@ -225,7 +225,7 @@ static int __init pikawdt_init(void)
{
struct device_node *np;
void __iomem *fpga;
- static u32 post1;
+ u32 post1;
int ret;
np = of_find_compatible_node(NULL, NULL, "pika,fpga");