[kernel] r14780 - in dists/trunk/linux-2.6/debian: . config/s390

[Bastian Blank]

Author: waldi
Date: Sat Dec 12 16:02:36 2009
New Revision: 14780

Log:
* debian/changelog: Update.
* debian/config/s390/config: Enable ZVM_WATCHDOG.

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/s390/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sat Dec 12 16:01:32 2009	(r14779)
+++ dists/trunk/linux-2.6/debian/changelog	Sat Dec 12 16:02:36 2009	(r14780)
@@ -4,7 +4,9 @@
   * 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)

Modified: dists/trunk/linux-2.6/debian/config/s390/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/s390/config	Sat Dec 12 16:01:32 2009	(r14779)
+++ dists/trunk/linux-2.6/debian/config/s390/config	Sat Dec 12 16:02:36 2009	(r14780)
@@ -130,6 +130,11 @@
 CONFIG_ZFCP=m
 
 ##
+## file: drivers/watchdog/Kconfig
+##
+CONFIG_ZVM_WATCHDOG=m
+
+##
 ## file: fs/partitions/Kconfig
 ##
 # CONFIG_ACORN_PARTITION is not set