[WATCHDOG] acquirewdt compile fixes

diff --git a/drivers/char/watchdog/acquirewdt.c b/drivers/char/watchdog/acquirewdt.c
index 19b1a5134865ddfcab2e33f9abbc72fa0a824fce..b509fb7314548ecd21224b680ead461432535939 100644 (file)
--- a/drivers/char/watchdog/acquirewdt.c
+++ b/drivers/char/watchdog/acquirewdt.c
@@ -45,6 +45,7 @@
 
 static int acq_is_open;
 static spinlock_t acq_lock;
+static int expect_close = 0;
 
 /*
  *     You must set these - there is no sane way to probe for this board.
@@ -218,7 +219,7 @@ static struct miscdevice acq_miscdev=
  
 static struct notifier_block acq_notifier =
 {
-       .self = acq_notify_sys,
+       .notifier_call = acq_notify_sys,
        .next = NULL,
        .priority = 0
 };

diff --git a/include/linux/watchdog.h b/include/linux/watchdog.h
index 391779c8b965ce0b056c3813038b7e26bdaa4bc6..e208b6f07d67dfbd3cbb7f48e7e42ff1b026fa5c 100644 (file)
--- a/include/linux/watchdog.h
+++ b/include/linux/watchdog.h
@@ -39,6 +39,7 @@ struct watchdog_info {
 #define        WDIOF_CARDRESET         0x0020  /* Card previously reset the CPU */
 #define WDIOF_POWEROVER                0x0040  /* Power over voltage */
 #define WDIOF_SETTIMEOUT       0x0080  /* Set timeout (in seconds) */
+#define WDIOF_MAGICCLOSE       0x0100  /* Supports magic close char */
 #define        WDIOF_KEEPALIVEPING     0x8000  /* Keep alive ping reply */
 
 #define        WDIOS_DISABLECARD       0x0001  /* Turn off the watchdog timer */