From dd7b96647dd6451d9f780ab31720d31937c2a697 Mon Sep 17 00:00:00 2001 From: dann frazier Date: Wed, 5 Dec 2007 01:37:11 +0000 Subject: [PATCH] merge r9887 from sid branch (enable CONFIG_BLK_CPQ_DA on ia64) svn path=/dists/trunk/linux-2.6/; revision=9889 --- debian/changelog | 5 ++++- debian/config/ia64/config | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ebaf68e3c..895dc405c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,7 +25,10 @@ linux-2.6 (2.6.24~rc4-1~experimental.1) UNRELEASED; urgency=low [ Martin Michlmayr ] * [mipsel/r5k-cobalt] Enable the new LEDs driver for Cobalt RaQ. - -- maximilian attems Tue, 04 Dec 2007 16:51:53 +0100 + [ dann frazier ] + * [ia64]: Enable BLK_CPQ_DA + + -- dann frazier Tue, 04 Dec 2007 13:17:13 -0700 linux-2.6 (2.6.23-1~experimental.1) UNRELEASED; urgency=low diff --git a/debian/config/ia64/config b/debian/config/ia64/config index 1767241d7..892c5fa2d 100644 --- a/debian/config/ia64/config +++ b/debian/config/ia64/config @@ -226,6 +226,7 @@ CONFIG_SERIAL_CORE=y 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