summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorYegor Yefremov <yegorslists@googlemail.com>2010-12-14 16:29:31 +0100
committerWim Van Sebroeck <wim@iguana.be>2011-01-12 10:24:52 +0000
commit568dba66ac307532b6703331df71c17373c17a4a (patch)
tree93127049d85826a5a2f96d5c94b454588ea45406 /drivers/watchdog
parent6ae98ed186cbe6909105c536c24419e52af8fc66 (diff)
downloadlinux-stable-568dba66ac307532b6703331df71c17373c17a4a.tar.gz
linux-stable-568dba66ac307532b6703331df71c17373c17a4a.tar.bz2
linux-stable-568dba66ac307532b6703331df71c17373c17a4a.zip
watchdog: ks8695_wdt: include mach/hardware.h instead of mach/timex.h.
ks8695_wdt needs KS8695_CLOCK_RATE, which is defined in mach/hardware.h, which is pulled in by the include of mach/timex.h, but the latter is going away, so just include mach/hardware.h directly. Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/ks8695_wdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/ks8695_wdt.c b/drivers/watchdog/ks8695_wdt.c
index 2852bb2e3fd9..811471903e8a 100644
--- a/drivers/watchdog/ks8695_wdt.c
+++ b/drivers/watchdog/ks8695_wdt.c
@@ -21,7 +21,7 @@
#include <linux/watchdog.h>
#include <linux/io.h>
#include <linux/uaccess.h>
-#include <mach/timex.h>
+#include <mach/hardware.h>
#include <mach/regs-timer.h>
#define WDT_DEFAULT_TIME 5 /* seconds */