diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2011-08-18 15:13:00 -0400 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2011-11-02 09:15:29 -0400 |
| commit | d805a78603bb489d71a12466e8f29c5e9837e50a (patch) | |
| tree | 12d7273a3cbd4f28e833232e9d884b6c3b7f904e /drivers/watchdog | |
| parent | bad3118fcdeb4b7b5bf18cb40b2548cf891646b2 (diff) | |
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/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 86b0735e6aa0..340b2b3e15d6 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig | |||
| @@ -1174,6 +1174,10 @@ config XEN_WDT | |||
| 1174 | by Xen 4.0 and newer. The watchdog timeout period is normally one | 1174 | by Xen 4.0 and newer. The watchdog timeout period is normally one |
| 1175 | minute but can be changed with a boot-time parameter. | 1175 | minute but can be changed with a boot-time parameter. |
| 1176 | 1176 | ||
| 1177 | config UML_WATCHDOG | ||
| 1178 | tristate "UML watchdog" | ||
| 1179 | depends on UML | ||
| 1180 | |||
| 1177 | # | 1181 | # |
| 1178 | # ISA-based Watchdog Cards | 1182 | # ISA-based Watchdog Cards |
| 1179 | # | 1183 | # |