From a3f4314b26e6bbb675b691c446b7bc1c354b7593 Mon Sep 17 00:00:00 2001
From: Wim Van Sebroeck <wim@iguana.be>
Date: Sun, 12 Feb 2006 17:44:57 +0100
Subject: [PATCH] --- yaml --- r: 25235 b: refs/heads/master c:
 369fa25294b8225cb3a7fefabf047a2676bf6abd h: refs/heads/master i:   25233:
 943e76f04eabb4db2f8e955ced97ca674433a8d1   25231:
 bfdf1e06862ae8d80ab895b57d4818a97552c9df v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/char/watchdog/pcwd.c | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index dcb6c34030c1..e59b420a6477 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c324ab4281d6b7a3130e9291d74b5c2361a16d56
+refs/heads/master: 369fa25294b8225cb3a7fefabf047a2676bf6abd
diff --git a/trunk/drivers/char/watchdog/pcwd.c b/trunk/drivers/char/watchdog/pcwd.c
index 0e4b3dfa0084..28a404adf8f0 100644
--- a/trunk/drivers/char/watchdog/pcwd.c
+++ b/trunk/drivers/char/watchdog/pcwd.c
@@ -66,8 +66,6 @@
 #include <linux/fs.h>		/* For file operations */
 #include <linux/ioport.h>	/* For io-port access */
 #include <linux/spinlock.h>	/* For spin_lock/spin_unlock/... */
-#include <linux/sched.h>	/* TASK_INTERRUPTIBLE, set_current_state() and friends */
-#include <linux/slab.h>		/* For kmalloc */
 
 #include <asm/uaccess.h>	/* For copy_to_user/put_user/... */
 #include <asm/io.h>		/* For inb/outb/... */
@@ -126,9 +124,14 @@
 #define CMD_ISA_VERSION_HUNDRETH	0x03
 #define CMD_ISA_VERSION_MINOR		0x04
 #define CMD_ISA_SWITCH_SETTINGS		0x05
+#define CMD_ISA_RESET_PC		0x06
+#define CMD_ISA_ARM_0			0x07
+#define CMD_ISA_ARM_30			0x08
+#define CMD_ISA_ARM_60			0x09
 #define CMD_ISA_DELAY_TIME_2SECS	0x0A
 #define CMD_ISA_DELAY_TIME_4SECS	0x0B
 #define CMD_ISA_DELAY_TIME_8SECS	0x0C
+#define CMD_ISA_RESET_RELAYS		0x0D
 
 /*
  * We are using an kernel timer to do the pinging of the watchdog
@@ -473,6 +476,7 @@ static int pcwd_get_status(int *status)
 			if (temp_panic) {
 				printk (KERN_INFO PFX "Temperature overheat trip!\n");
 				kernel_power_off();
+				/* or should we just do a: panic(PFX "Temperature overheat trip!\n"); */
 			}
 		}
 	} else {
@@ -484,6 +488,7 @@ static int pcwd_get_status(int *status)
 			if (temp_panic) {
 				printk (KERN_INFO PFX "Temperature overheat trip!\n");
 				kernel_power_off();
+				/* or should we just do a: panic(PFX "Temperature overheat trip!\n"); */
 			}
 		}
 	}
@@ -983,6 +988,8 @@ static void __exit pcwd_cleanup_module(void)
 {
 	if (pcwd_private.io_addr)
 		pcwatchdog_exit();
+
+	printk(KERN_INFO PFX "Watchdog Module Unloaded.\n");
 }
 
 module_init(pcwd_init_module);