diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-11 10:42:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-11 10:42:43 -0700 |
| commit | 3f1ae223902834d81b54b5d333f9efca07ad656b (patch) | |
| tree | dd03e325404fc03692ffd1cd9f4d83ad89584d69 /drivers/watchdog/pcwd.c | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc (diff) | |
| parent | [WATCHDOG] pcwd.c - fix open_allowed type. (diff) | |
| download | linux-dev-3f1ae223902834d81b54b5d333f9efca07ad656b.tar.xz linux-dev-3f1ae223902834d81b54b5d333f9efca07ad656b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
[WATCHDOG] pcwd.c - fix open_allowed type.
[WATCHDOG] fix watchdog/ixp4xx_wdt.c compilation
[WATCHDOG] fix watchdog/wdt285.c compilation
[WATCHDOG] fix watchdog/at91rm9200_wdt.c compilation
[WATCHDOG] fix watchdog/shwdt.c compilation
[WATCHDOG] fix watchdog/txx9wdt.c compilation
[WATCHDOG] MAINTAINERS: remove ZF MACHZ WATCHDOG entry
[WATCHDOG] Fix build with CONFIG_ITCO_VENDOR_SUPPORT=n
Diffstat (limited to 'drivers/watchdog/pcwd.c')
| -rw-r--r-- | drivers/watchdog/pcwd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/pcwd.c b/drivers/watchdog/pcwd.c index 3b0ddc7fcf3f..9e1331a3b215 100644 --- a/drivers/watchdog/pcwd.c +++ b/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; |