summaryrefslogtreecommitdiff
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2011-08-18 20:13:00 +0100
committerRichard Weinberger <richard@nod.at>2011-11-02 14:15:29 +0100
commitd805a78603bb489d71a12466e8f29c5e9837e50a (patch)
tree12d7273a3cbd4f28e833232e9d884b6c3b7f904e /drivers/watchdog
parentbad3118fcdeb4b7b5bf18cb40b2548cf891646b2 (diff)
downloadlinux-3.10-d805a78603bb489d71a12466e8f29c5e9837e50a.tar.gz
linux-3.10-d805a78603bb489d71a12466e8f29c5e9837e50a.tar.bz2
linux-3.10-d805a78603bb489d71a12466e8f29c5e9837e50a.zip
um: clean Kconfig up a bit
* kill duplicates with drivers/char/Kconfig * take watchdog one into drivers/watchdog/Kconfig * take mmapper to arch/um/Kconfig.um * rename Kconfig.char menu to "UML Character Devices" Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/Kconfig4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 86b0735e6aa..340b2b3e15d 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -1174,6 +1174,10 @@ config XEN_WDT
by Xen 4.0 and newer. The watchdog timeout period is normally one
minute but can be changed with a boot-time parameter.
+config UML_WATCHDOG
+ tristate "UML watchdog"
+ depends on UML
+
#
# ISA-based Watchdog Cards
#