summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/Makefile
diff options
context:
space:
mode:
authorDonald Johnson2011-02-02 17:20:16 +0100
committerWim Van Sebroeck2011-03-15 17:02:06 +0100
commit57539c1cf9f146ab9988a350dbc2d7e69a8a5c30 (patch)
tree5a9201718926afdac1bce6a179ec7f1c8a9428ff /drivers/watchdog/Makefile
parentwatchdog: jz4740_wdt - fix magic character checking (diff)
downloadkernel-qcow2-linux-57539c1cf9f146ab9988a350dbc2d7e69a8a5c30.tar.gz
kernel-qcow2-linux-57539c1cf9f146ab9988a350dbc2d7e69a8a5c30.tar.xz
kernel-qcow2-linux-57539c1cf9f146ab9988a350dbc2d7e69a8a5c30.zip
watchdog: Intel SCU Watchdog Timer Driver for Moorestown and Medfield platforms.
This submission includes: - Fix to intel_scu_write() to start watchdog timer the on the first write, and refresh on subsequent writes. This enables Open, write, write, ... usage model. - Moves boot parameter checks from intel_scu_open() to intel_scu_watchdog_init(), so driver init will fail if these parameters are out of bounds. - Adds check for whether process waiting in wait_event_interruptible() received a signal while it was waiting. - Other small error handling changes. Removed the read() method for now as that wass a non-standard behaviour. Signed-off-by: Donald Johnson <donald.k.johnson@intel.com> Signed-off-by: Shuduo Sang <shuduo.sang@intel.com> Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/Makefile')
-rw-r--r--drivers/watchdog/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index fd9c8c073a0a..b037f3d0ec1a 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -102,6 +102,7 @@ obj-$(CONFIG_W83877F_WDT) += w83877f_wdt.o
obj-$(CONFIG_W83977F_WDT) += w83977f_wdt.o
obj-$(CONFIG_MACHZ_WDT) += machzwd.o
obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc_epx_c3.o
+obj-$(CONFIG_INTEL_SCU_WATCHDOG) += intel_scu_watchdog.o
# M32R Architecture