diff options
| author | Daniel Schaeffer <daniel@dschaeffer.localdomain> | 2008-02-04 16:52:27 -0500 |
|---|---|---|
| committer | Daniel Schaeffer <daniel@dschaeffer.localdomain> | 2008-02-04 16:52:27 -0500 |
| commit | 2fa1fa2268689145024d2028e9b5e250d88eeb3f (patch) | |
| tree | e26e5b84719c5184637ad60e8c7282a249be89a9 | |
| parent | ed4c3abaf2cf21cf2a75b9408acd0ff1dfe8e44e (diff) | |
Moved mx watchdog driver
Changes to be committed:
modified: drivers/watchdog/Kconfig
modified: drivers/watchdog/Makefile
| -rw-r--r-- | drivers/watchdog/Kconfig | 13 | ||||
| -rw-r--r-- | drivers/watchdog/Makefile | 1 | ||||
| -rw-r--r-- | drivers/watchdog/mxc_wdt.c (renamed from drivers/char/watchdog/mxc_wdt.c) | 0 | ||||
| -rw-r--r-- | drivers/watchdog/mxc_wdt.h (renamed from drivers/char/watchdog/mxc_wdt.h) | 0 |
4 files changed, 14 insertions, 0 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 52dff40ec192..fea878a49a42 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -189,6 +189,19 @@ config PNX4008_WATCHDOG Say N if you are unsure. +config MXC_WATCHDOG + tristate "MXC watchdog" + depends on WATCHDOG && WATCHDOG_NOWAYOUT + depends on ARCH_MXC + help + Watchdog timer embedded into MXC chips. This will + reboot your system when timeout is reached. + + NOTE: once enabled, this timer cannot be disabled. + To compile this driver as a module, choose M here: the + module will be called mxc_wdt. + + config IOP_WATCHDOG tristate "IOP Watchdog" depends on PLAT_IOP diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index 87483cc63252..bcea0cd34553 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -37,6 +37,7 @@ obj-$(CONFIG_SA1100_WATCHDOG) += sa1100_wdt.o obj-$(CONFIG_MPCORE_WATCHDOG) += mpcore_wdt.o obj-$(CONFIG_EP93XX_WATCHDOG) += ep93xx_wdt.o obj-$(CONFIG_PNX4008_WATCHDOG) += pnx4008_wdt.o +obj-$(CONFIG_MXC_WATCHDOG) += mxc_wdt.o obj-$(CONFIG_IOP_WATCHDOG) += iop_wdt.o obj-$(CONFIG_DAVINCI_WATCHDOG) += davinci_wdt.o diff --git a/drivers/char/watchdog/mxc_wdt.c b/drivers/watchdog/mxc_wdt.c index 126b14357d5a..126b14357d5a 100644 --- a/drivers/char/watchdog/mxc_wdt.c +++ b/drivers/watchdog/mxc_wdt.c diff --git a/drivers/char/watchdog/mxc_wdt.h b/drivers/watchdog/mxc_wdt.h index cd09b9acf99f..cd09b9acf99f 100644 --- a/drivers/char/watchdog/mxc_wdt.h +++ b/drivers/watchdog/mxc_wdt.h |