aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/configs/default_defconfig
diff options
context:
space:
mode:
authorPhilipp Hachtmann <phacht@de.ibm.com>2014-06-05 11:01:43 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2014-06-10 10:48:29 +0200
commitf7a94db4e9594fd4b67e715d7b26864b7bd74a75 (patch)
tree78fb2427c31a5c9ba3625725094a899ec111d951 /arch/s390/configs/default_defconfig
parents390/sclp_vt220: Enable ASCII console per default (diff)
downloadlinux-dev-f7a94db4e9594fd4b67e715d7b26864b7bd74a75.tar.xz
linux-dev-f7a94db4e9594fd4b67e715d7b26864b7bd74a75.zip
s390/watchdog: use watchdog API
Converted the vmwatchdog driver to use the kernel's watchdog API. Signed-off-by: Philipp Hachtmann <phacht@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/configs/default_defconfig')
-rw-r--r--arch/s390/configs/default_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/configs/default_defconfig b/arch/s390/configs/default_defconfig
index 8df022c43af7..350ea0d88746 100644
--- a/arch/s390/configs/default_defconfig
+++ b/arch/s390/configs/default_defconfig
@@ -456,6 +456,7 @@ CONFIG_TN3270_FS=y
CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_NOWAYOUT=y
CONFIG_SOFT_WATCHDOG=m
+CONFIG_DIAG288_WATCHDOG=m
# CONFIG_HID is not set
# CONFIG_USB_SUPPORT is not set
CONFIG_INFINIBAND=m