aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <benh@debian.org>2011-12-21 03:37:24 +0000
committerBen Hutchings <benh@debian.org>2011-12-21 03:37:24 +0000
commit6d1ffd1fd5a1fa3ec6757c84a433d58314c71651 (patch)
tree8a2a071159de38e88208a00470e0f3b3b82f1b5f
parentb2a5a30054943b36ef42fc526120e8162966ffa1 (diff)
downloadkernel_replicant_linux-6d1ffd1fd5a1fa3ec6757c84a433d58314c71651.tar.gz
kernel_replicant_linux-6d1ffd1fd5a1fa3ec6757c84a433d58314c71651.tar.bz2
kernel_replicant_linux-6d1ffd1fd5a1fa3ec6757c84a433d58314c71651.zip
[x86] Include isci in installer
svn path=/dists/sid/linux-2.6/; revision=18402
-rw-r--r--debian/changelog1
-rw-r--r--debian/installer/modules/scsi-extra-modules1
2 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index bad61d999489..f9536dceddba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ linux-2.6 (3.1.5-2) UNRELEASED; urgency=low
- Provide the default configuration instead of including it from the
kernel-wedge package
- [x86] Include et131x (Closes: #651440)
+ - [x86] Include isci
[ Arnaud Patard ]
* [arm] setup: initialize arm_dma_zone_size earlier (Closes: #651215)
diff --git a/debian/installer/modules/scsi-extra-modules b/debian/installer/modules/scsi-extra-modules
index 5fa68cbd70e3..ee03ecd1838a 100644
--- a/debian/installer/modules/scsi-extra-modules
+++ b/debian/installer/modules/scsi-extra-modules
@@ -35,6 +35,7 @@ hptiop ?
qla4xxx ?
qla2xxx ?
pm8001 ?
+isci ?
# VMWare
vmw_pvscsi ?