diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-13 12:45:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-13 12:45:20 -0400 |
| commit | a8cd2e5045688157479a654786b2c08ab85f4d8f (patch) | |
| tree | 03631c4a879e808ec39ef7b79b945766df048c08 /include | |
| parent | 0160f53e427e9f1f6d19b898867c105406037b6f (diff) | |
| parent | c315b7e840a1f336ffefb21d3130f9799af2ecd6 (diff) | |
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 835930d6faa..75c2ffa26b2 100644 --- a/include/asm-ppc/mv64x60.h +++ b/include/asm-ppc/mv64x60.h | |||
| @@ -119,6 +119,14 @@ extern spinlock_t mv64x60_lock; | |||
| 119 | 119 | ||
| 120 | #define MV64x60_64BIT_WIN_COUNT 24 | 120 | #define MV64x60_64BIT_WIN_COUNT 24 |
| 121 | 121 | ||
| 122 | /* Watchdog Platform Device, Driver Data */ | ||
| 123 | #define MV64x60_WDT_NAME "wdt" | ||
| 124 | |||
| 125 | struct mv64x60_wdt_pdata { | ||
| 126 | int timeout; /* watchdog expiry in seconds, default 10 */ | ||
| 127 | int bus_clk; /* bus clock in MHz, default 133 */ | ||
| 128 | }; | ||
| 129 | |||
| 122 | /* | 130 | /* |
| 123 | * Define a structure that's used to pass in config information to the | 131 | * Define a structure that's used to pass in config information to the |
| 124 | * core routines. | 132 | * core routines. |