diff --git a/[refs] b/[refs] index 7c07b3dd49bb..f0239ef73f32 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9229376e9beba0dd449dd4869283545c1d042128 +refs/heads/master: 36cbaa8777dd5a79cb56c2a3d7d56f0c80b2bab6 diff --git a/trunk/drivers/watchdog/pcwd.c b/trunk/drivers/watchdog/pcwd.c index 3b0ddc7fcf3f..9e1331a3b215 100644 --- a/trunk/drivers/watchdog/pcwd.c +++ b/trunk/drivers/watchdog/pcwd.c @@ -168,7 +168,7 @@ static const int heartbeat_tbl[] = { static int cards_found; /* internal variables */ -static atomic_t open_allowed = ATOMIC_INIT(1); +static unsigned long open_allowed; static char expect_close; static int temp_panic;