[kernel] r9592 - in dists/sid/linux-2.6/debian: . arch/ia64

[Dann Frazier]

Author: dannf
Date: Mon Oct  1 21:06:19 2007
New Revision: 9592

Log:
merge r9591 from trunk: [ia64] Enable cciss module

Modified:
   dists/sid/linux-2.6/debian/arch/ia64/config
   dists/sid/linux-2.6/debian/changelog

Modified: dists/sid/linux-2.6/debian/arch/ia64/config
==============================================================================
--- dists/sid/linux-2.6/debian/arch/ia64/config	(original)
+++ dists/sid/linux-2.6/debian/arch/ia64/config	Mon Oct  1 21:06:19 2007
@@ -212,6 +212,7 @@
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_SERIAL_SGI_L1_CONSOLE=y
 CONFIG_SERIAL_JSM=m
+CONFIG_BLK_CPQ_CISS_DA=m
 CONFIG_SERIAL_SGI_IOC4=m
 CONFIG_SERIAL_SGI_IOC3=m
 CONFIG_PRINTER=m

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Mon Oct  1 21:06:19 2007
@@ -43,7 +43,10 @@
   [ Bastian Blank ]
   * Fix tainted check in bug scripts.
 
- -- Bastian Blank <waldi at debian.org>  Sun, 09 Sep 2007 15:13:20 +0200
+  [ dann frazier ]
+  * [ia64] Enable cciss module
+
+ -- dann frazier <dannf at debian.org>  Mon, 01 Oct 2007 15:06:16 -0600
 
 linux-2.6 (2.6.22-4) unstable; urgency=low