[kernel] r5172 - in dists/trunk/linux-2.6/debian: . arch/s390

[Bastian Blank]

Author: waldi
Date: Mon Jan  2 10:30:38 2006
New Revision: 5172

Modified:
   dists/trunk/linux-2.6/debian/arch/s390/config
   dists/trunk/linux-2.6/debian/arch/s390/config.s390
   dists/trunk/linux-2.6/debian/arch/s390/config.s390-tape
   dists/trunk/linux-2.6/debian/changelog
Log:
Update s390 configs.

* debian/arch/s390/config: Add CONFIG_DASD_DIAG.
* debian/arch/s390/config.s390, debian/arch/s390/config.s390-tape:
  Remove CONFIG_DASD_DIAG.
* debian/changelog: Update.


Modified: dists/trunk/linux-2.6/debian/arch/s390/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/s390/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/s390/config	Mon Jan  2 10:30:38 2006
@@ -52,6 +52,7 @@
 # CONFIG_DASD_PROFILE is not set
 CONFIG_DASD_ECKD=m
 CONFIG_DASD_FBA=m
+# CONFIG_DASD_DIAG is not set
 # CONFIG_DASD_CMB is not set
 # CONFIG_ATA_OVER_ETH is not set
 # CONFIG_MD_RAID10 is not set

Modified: dists/trunk/linux-2.6/debian/arch/s390/config.s390
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/s390/config.s390	(original)
+++ dists/trunk/linux-2.6/debian/arch/s390/config.s390	Mon Jan  2 10:30:38 2006
@@ -8,4 +8,3 @@
 # CONFIG_IPL_TAPE is not set
 CONFIG_IPL_VM=y
 # CONFIG_LBD is not set
-# CONFIG_DASD_DIAG is not set

Modified: dists/trunk/linux-2.6/debian/arch/s390/config.s390-tape
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/s390/config.s390-tape	(original)
+++ dists/trunk/linux-2.6/debian/arch/s390/config.s390-tape	Mon Jan  2 10:30:38 2006
@@ -8,4 +8,3 @@
 CONFIG_IPL_TAPE=y
 # CONFIG_IPL_VM is not set
 # CONFIG_LBD is not set
-# CONFIG_DASD_DIAG is not set

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Mon Jan  2 10:30:38 2006
@@ -1,3 +1,10 @@
+linux-2.6 (2.6.14+2.6.15-rc7-0experimental.3) UNRELEASED; urgency=low
+
+  [ Bastian Blank ]
+  * [s390] Update configs.
+
+ -- Bastian Blank <waldi at debian.org>  Mon, 02 Jan 2006 11:23:55 +0100
+
 linux-2.6 (2.6.14+2.6.15-rc7-0experimental.2) experimental; urgency=low
 
   [ Kyle McMartin ]