diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-13 18:45:20 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-13 18:45:20 +0200 |
commit | a8cd2e5045688157479a654786b2c08ab85f4d8f (patch) | |
tree | 03631c4a879e808ec39ef7b79b945766df048c08 /include | |
parent | [PATCH] ppc64: Make eeh_init function again (diff) | |
parent | [WATCHDOG] pcwd_pci-include+WDIOC_SETOPTIONS-patch (diff) | |
download | linux-a8cd2e5045688157479a654786b2c08ab85f4d8f.tar.xz 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.h | 8 |
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. |