r1949 - in trunk/kernel/s390/2.6.8: config debian

[Bastian Blank]

Author: waldi
Date: 2004-11-30 03:34:49 -0700 (Tue, 30 Nov 2004)
New Revision: 1949

Modified:
   trunk/kernel/s390/2.6.8/config/s390
   trunk/kernel/s390/2.6.8/config/s390x
   trunk/kernel/s390/2.6.8/debian/changelog
Log:
- Enable scsi legacy proc interface.
- Enable tape support.


Modified: trunk/kernel/s390/2.6.8/config/s390
===================================================================
--- trunk/kernel/s390/2.6.8/config/s390	2004-11-30 08:26:02 UTC (rev 1948)
+++ trunk/kernel/s390/2.6.8/config/s390	2004-11-30 10:34:49 UTC (rev 1949)
@@ -107,7 +107,7 @@
 # SCSI device support
 #
 CONFIG_SCSI=m
-# CONFIG_SCSI_PROC_FS is not set
+CONFIG_SCSI_PROC_FS=y
 
 #
 # SCSI support type (disk, tape, CD-ROM)
@@ -214,7 +214,7 @@
 #
 # S/390 tape hardware support
 #
-# CONFIG_S390_TAPE_34XX is not set
+CONFIG_S390_TAPE_34XX=m
 
 #
 # Cryptographic devices

Modified: trunk/kernel/s390/2.6.8/config/s390x
===================================================================
--- trunk/kernel/s390/2.6.8/config/s390x	2004-11-30 08:26:02 UTC (rev 1948)
+++ trunk/kernel/s390/2.6.8/config/s390x	2004-11-30 10:34:49 UTC (rev 1949)
@@ -108,7 +108,7 @@
 # SCSI device support
 #
 CONFIG_SCSI=m
-# CONFIG_SCSI_PROC_FS is not set
+CONFIG_SCSI_PROC_FS=y
 
 #
 # SCSI support type (disk, tape, CD-ROM)
@@ -213,7 +213,7 @@
 #
 # S/390 tape hardware support
 #
-# CONFIG_S390_TAPE_34XX is not set
+CONFIG_S390_TAPE_34XX=m
 
 #
 # Cryptographic devices

Modified: trunk/kernel/s390/2.6.8/debian/changelog
===================================================================
--- trunk/kernel/s390/2.6.8/debian/changelog	2004-11-30 08:26:02 UTC (rev 1948)
+++ trunk/kernel/s390/2.6.8/debian/changelog	2004-11-30 10:34:49 UTC (rev 1949)
@@ -1,3 +1,11 @@
+kernel-image-2.6.8-s390 (2.6.8-4) UNRELEASED; urgency=high
+
+  * config
+    - Enable scsi legacy proc interface.
+    - Enable tape support.
+
+ -- Bastian Blank <waldi@debian.org>  Sat, 27 Nov 2004 21:45:36 +0100
+
 kernel-image-2.6.8-s390 (2.6.8-3) unstable; urgency=high
 
   * debian/rules
@@ -2,4 +10,4 @@
     - Ask patch to suppress backup.
-  * Use kernel-tree-2.6.8-10.
-    - Fix local root exploit. (CAN-2004-0887)
+  * Use kernel-tree-2.6.8-10
+    - CAN-2004-0887