summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-13 09:45:20 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-13 09:45:20 -0700
commita8cd2e5045688157479a654786b2c08ab85f4d8f (patch)
tree03631c4a879e808ec39ef7b79b945766df048c08 /include
parent0160f53e427e9f1f6d19b898867c105406037b6f (diff)
parentc315b7e840a1f336ffefb21d3130f9799af2ecd6 (diff)
downloadblackbird-op-linux-a8cd2e5045688157479a654786b2c08ab85f4d8f.tar.gz
blackbird-op-linux-a8cd2e5045688157479a654786b2c08ab85f4d8f.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
Diffstat (limited to 'include')
-rw-r--r--include/asm-ppc/mv64x60.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/asm-ppc/mv64x60.h b/include/asm-ppc/mv64x60.h
index 835930d6faa1..75c2ffa26b26 100644
--- a/include/asm-ppc/mv64x60.h
+++ b/include/asm-ppc/mv64x60.h
@@ -119,6 +119,14 @@ extern spinlock_t mv64x60_lock;
#define MV64x60_64BIT_WIN_COUNT 24
+/* Watchdog Platform Device, Driver Data */
+#define MV64x60_WDT_NAME "wdt"
+
+struct mv64x60_wdt_pdata {
+ int timeout; /* watchdog expiry in seconds, default 10 */
+ int bus_clk; /* bus clock in MHz, default 133 */
+};
+
/*
* Define a structure that's used to pass in config information to the
* core routines.
OpenPOWER on IntegriCloud