From a9bc22a7b3086d22e2f08547d24828813527232d Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi@debian.org>
Date: Sat, 12 Dec 2009 16:02:36 +0000
Subject: [PATCH] * debian/changelog: Update. * debian/config/s390/config:
 Enable ZVM_WATCHDOG.

svn path=/dists/trunk/linux-2.6/; revision=14780
---
 debian/changelog          | 4 +++-
 debian/config/s390/config | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 09b2e7498..e6908a8c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,9 @@ linux-2.6 (2.6.32-2) UNRELEASED; urgency=low
   * Allow memory hot-add and -remove if possible.
   * Enable USB suspend.
   * Enable kernel samepage merging. (closes: #558200)
-  * [s390] Enable SECCOMP.
+  * [s390]
+    - Enable SECCOMP.
+    - Enable z/VM Watchdog Timer.
 
   [ Moritz Muehlenhoff ]
   * Disable cryptoloop (Closes: #559755)
diff --git a/debian/config/s390/config b/debian/config/s390/config
index 0cadc1dbd..78165bbfa 100644
--- a/debian/config/s390/config
+++ b/debian/config/s390/config
@@ -129,6 +129,11 @@ CONFIG_QETH_L3=m
 # CONFIG_SCSI_DEBUG is not set
 CONFIG_ZFCP=m
 
+##
+## file: drivers/watchdog/Kconfig
+##
+CONFIG_ZVM_WATCHDOG=m
+
 ##
 ## file: fs/partitions/Kconfig
 ##