From 4e3cc01bcfdb4f73774b7fee5ef0a62c4a67a745 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Mon, 25 Feb 2008 13:39:57 +0100 Subject: [PATCH] --- yaml --- r: 87108 b: refs/heads/master c: 996d62d449a7d5e691b0da22b7c877df08c2b0a4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/watchdog/cpu5wdt.c | 4 ++-- trunk/drivers/watchdog/mtx-1_wdt.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index b1559867b9d0..07c95dc1d020 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fa9363c5f866d6beedf36d4f4b1393ba802d8248 +refs/heads/master: 996d62d449a7d5e691b0da22b7c877df08c2b0a4 diff --git a/trunk/drivers/watchdog/cpu5wdt.c b/trunk/drivers/watchdog/cpu5wdt.c index 5941ca601a3a..df72f90123df 100644 --- a/trunk/drivers/watchdog/cpu5wdt.c +++ b/trunk/drivers/watchdog/cpu5wdt.c @@ -59,9 +59,9 @@ static int ticks = 10000; static struct { struct completion stop; - volatile int running; + int running; struct timer_list timer; - volatile int queue; + int queue; int default_ticks; unsigned long inuse; } cpu5wdt_device; diff --git a/trunk/drivers/watchdog/mtx-1_wdt.c b/trunk/drivers/watchdog/mtx-1_wdt.c index 789831b3fa00..10b89f2703bd 100644 --- a/trunk/drivers/watchdog/mtx-1_wdt.c +++ b/trunk/drivers/watchdog/mtx-1_wdt.c @@ -59,9 +59,9 @@ static int ticks = 100 * HZ; static struct { struct completion stop; - volatile int running; + int running; struct timer_list timer; - volatile int queue; + int queue; int default_ticks; unsigned long inuse; unsigned gpio;