[kernel] r9889 - in dists/trunk/linux-2.6/debian: . config/ia64

[Dann Frazier]

Author: dannf
Date: Wed Dec  5 01:37:11 2007
New Revision: 9889

Log:
merge r9887 from sid branch (enable CONFIG_BLK_CPQ_DA on ia64)

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/ia64/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Wed Dec  5 01:37:11 2007
@@ -25,7 +25,10 @@
   [ Martin Michlmayr ]
   * [mipsel/r5k-cobalt] Enable the new LEDs driver for Cobalt RaQ.
 
- -- maximilian attems <maks at debian.org>  Tue, 04 Dec 2007 16:51:53 +0100
+  [ dann frazier ]
+  * [ia64]: Enable BLK_CPQ_DA
+	
+ -- dann frazier <dannf at debian.org>  Tue, 04 Dec 2007 13:17:13 -0700
 
 linux-2.6 (2.6.23-1~experimental.1) UNRELEASED; urgency=low
 

Modified: dists/trunk/linux-2.6/debian/config/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/ia64/config	(original)
+++ dists/trunk/linux-2.6/debian/config/ia64/config	Wed Dec  5 01:37:11 2007
@@ -226,6 +226,7 @@
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_SERIAL_SGI_L1_CONSOLE=y
 CONFIG_SERIAL_JSM=m
+CONFIG_BLK_CPQ_DA=m
 CONFIG_BLK_CPQ_CISS_DA=m
 CONFIG_CISS_SCSI_TAPE=y
 CONFIG_BLK_DEV_DAC960=m