diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-08 10:25:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-08 10:25:13 -0700 |
| commit | cd3c1cde262b0f068d27d980648892b2843966d4 (patch) | |
| tree | b3c4433b39b790894836ac1fde2ee6d5f878e296 /drivers/watchdog/ks8695_wdt.c | |
| parent | 5b61f6accfd6449150aefe13a7679ec360abcc16 (diff) | |
| parent | c9a0c8a6845b5efb64841f40b8efb4c387051d46 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
[WATCHDOG] orion5x_wdt.c: 'ORION5X_TCLK' undeclared
[WATCHDOG] gef_wdt.c: fsl_get_sys_freq() failure not noticed
[WATCHDOG] ks8695_wdt.c: 'CLOCK_TICK_RATE' undeclared
[WATCHDOG] rc32434_wdt: fix sections
[WATCHDOG] rc32434_wdt: fix watchdog driver
Diffstat (limited to 'drivers/watchdog/ks8695_wdt.c')
| -rw-r--r-- | drivers/watchdog/ks8695_wdt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/watchdog/ks8695_wdt.c b/drivers/watchdog/ks8695_wdt.c index 0b798fdaa37..74c92d38411 100644 --- a/drivers/watchdog/ks8695_wdt.c +++ b/drivers/watchdog/ks8695_wdt.c @@ -21,6 +21,7 @@ #include <linux/watchdog.h> #include <linux/io.h> #include <linux/uaccess.h> +#include <mach/timex.h> #include <mach/regs-timer.h> #define WDT_DEFAULT_TIME 5 /* seconds */ |