[kernel] r21684 - dists/trunk/linux/debian/config/kernelarch-s390

[Bastian Blank]

Author: waldi
Date: Mon Aug  4 15:10:54 2014
New Revision: 21684

Log:
debian/config/kernelarch-s490/config:
Restore option, remove option gone for good

Modified:
   dists/trunk/linux/debian/config/kernelarch-s390/config

Modified: dists/trunk/linux/debian/config/kernelarch-s390/config
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-s390/config	Mon Aug  4 15:09:18 2014	(r21683)
+++ dists/trunk/linux/debian/config/kernelarch-s390/config	Mon Aug  4 15:10:54 2014	(r21684)
@@ -137,6 +137,11 @@
 CONFIG_HVC_IUCV=y
 
 ##
+## file: drivers/watchdog/Kconfig
+##
+CONFIG_DIAG288_WATCHDOG=m
+
+##
 ## file: init/Kconfig
 ##
 # CONFIG_PCI_QUIRKS is not set
@@ -181,9 +186,3 @@
 ##
 # CONFIG_LLC2 is not set
 
-##
-## file: unknown
-##
-# CONFIG_ZFCPDUMP is not set
-CONFIG_ZVM_WATCHDOG=m
-