r2976 - in trunk/kernel/alpha/kernel-image-2.6.11-alpha-2.6.11: config debian

[Norbert Tretkowski]

Author: nobse
Date: 2005-04-12 20:01:58 +0000 (Tue, 12 Apr 2005)
New Revision: 2976

Modified:
   trunk/kernel/alpha/kernel-image-2.6.11-alpha-2.6.11/config/generic
   trunk/kernel/alpha/kernel-image-2.6.11-alpha-2.6.11/config/smp
   trunk/kernel/alpha/kernel-image-2.6.11-alpha-2.6.11/debian/changelog
Log:
merged changes from 2.6.8-9


Modified: trunk/kernel/alpha/kernel-image-2.6.11-alpha-2.6.11/config/generic
===================================================================
--- trunk/kernel/alpha/kernel-image-2.6.11-alpha-2.6.11/config/generic	2005-04-12 08:48:51 UTC (rev 2975)
+++ trunk/kernel/alpha/kernel-image-2.6.11-alpha-2.6.11/config/generic	2005-04-12 20:01:58 UTC (rev 2976)
@@ -516,7 +516,7 @@
 CONFIG_SCSI_PAS16=m
 CONFIG_SCSI_PSI240I=m
 CONFIG_SCSI_QLOGIC_FAS=m
-CONFIG_SCSI_QLOGIC_ISP=m
+# CONFIG_SCSI_QLOGIC_ISP is not set
 CONFIG_SCSI_QLOGIC_FC=m
 CONFIG_SCSI_QLOGIC_FC_FIRMWARE=y
 CONFIG_SCSI_QLOGIC_1280=m

Modified: trunk/kernel/alpha/kernel-image-2.6.11-alpha-2.6.11/config/smp
===================================================================
--- trunk/kernel/alpha/kernel-image-2.6.11-alpha-2.6.11/config/smp	2005-04-12 08:48:51 UTC (rev 2975)
+++ trunk/kernel/alpha/kernel-image-2.6.11-alpha-2.6.11/config/smp	2005-04-12 20:01:58 UTC (rev 2976)
@@ -518,7 +518,7 @@
 CONFIG_SCSI_PAS16=m
 CONFIG_SCSI_PSI240I=m
 CONFIG_SCSI_QLOGIC_FAS=m
-CONFIG_SCSI_QLOGIC_ISP=m
+# CONFIG_SCSI_QLOGIC_ISP is not set
 CONFIG_SCSI_QLOGIC_FC=m
 CONFIG_SCSI_QLOGIC_FC_FIRMWARE=y
 CONFIG_SCSI_QLOGIC_1280=m

Modified: trunk/kernel/alpha/kernel-image-2.6.11-alpha-2.6.11/debian/changelog
===================================================================
--- trunk/kernel/alpha/kernel-image-2.6.11-alpha-2.6.11/debian/changelog	2005-04-12 08:48:51 UTC (rev 2975)
+++ trunk/kernel/alpha/kernel-image-2.6.11-alpha-2.6.11/debian/changelog	2005-04-12 20:01:58 UTC (rev 2976)
@@ -20,6 +20,13 @@
   
  -- Norbert Tretkowski <nobse@debian.org>  Tue, 25 Jan 2005 21:35:11 +0100
 
+kernel-image-2.6.8-alpha (2.6.8-9) unstable; urgency=high
+
+  * Depend on initrd-tools >= 0.1.78. (closes: #301486)
+  * Disabled CONFIG_SCSI_QLOGIC_ISP, we now have CONFIG_SCSI_QLOGIC_1280_1040.
+
+ -- Norbert Tretkowski <nobse@debian.org>  Sun, 10 Apr 2005 19:39:45 +0200
+
 kernel-image-2.6.8-alpha (2.6.8-8) unstable; urgency=high
 
   * Built against kernel-tree 2.6.8-15.