merge r9887 from sid branch (enable CONFIG_BLK_CPQ_DA on ia64)
svn path=/dists/trunk/linux-2.6/; revision=9889
This commit is contained in:
parent
8d8ed61899
commit
dd7b96647d
|
@ -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 <maks@debian.org> Tue, 04 Dec 2007 16:51:53 +0100
|
||||
[ dann frazier ]
|
||||
* [ia64]: Enable BLK_CPQ_DA
|
||||
|
||||
-- dann frazier <dannf@debian.org> Tue, 04 Dec 2007 13:17:13 -0700
|
||||
|
||||
linux-2.6 (2.6.23-1~experimental.1) UNRELEASED; urgency=low
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue