Merge branch 'akpm' (Andrew's incoming - part two)

[pandora-kernel.git] / drivers / watchdog / Kconfig

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 86b0735..64c6752 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -726,7 +726,7 @@ config SBC8360_WDT
 
 config SBC7240_WDT
        tristate "SBC Nano 7240 Watchdog Timer"
-       depends on X86_32
+       depends on X86_32 && !UML
        ---help---
          This is the driver for the hardware watchdog found on the IEI
          single board computers EPIC Nano 7240 (and likely others). This
@@ -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
 #