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

[Bastian Blank]

Author: waldi
Date: Sat Jun  7 20:44:21 2008
New Revision: 11569

Log:
debian/changelog: Update.
debian/config/s390/config: Enable ZCRYPT.


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	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Sat Jun  7 20:44:21 2008
@@ -57,6 +57,7 @@
     (closes: #462529)
   * [s390] Synchronize block device, network bridge, network scheduler and CRC
     support.
+  * [s390] Enable support for PCI-attached cryptographic adapters.
 
  -- maximilian attems <maks at debian.org>  Sat, 26 Apr 2008 23:11:17 +0200
 

Modified: dists/trunk/linux-2.6/debian/config/s390/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/s390/config	(original)
+++ dists/trunk/linux-2.6/debian/config/s390/config	Sat Jun  7 20:44:21 2008
@@ -48,6 +48,8 @@
 ##
 ## file: drivers/crypto/Kconfig
 ##
+CONFIG_ZCRYPT=m
+# CONFIG_ZCRYPT_MONOLITHIC is not set
 CONFIG_CRYPTO_SHA1_S390=m
 CONFIG_CRYPTO_SHA256_S390=m
 CONFIG_CRYPTO_SHA512_S390=m