From b7801fa239f8f6b9372ab15a54ffebb64198ae68 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 24 Oct 2012 13:58:28 +0000 Subject: [PATCH] [x86] udeb: Re-add isci to scsi-extra-modules (Closes: #690886) svn path=/dists/sid/linux/; revision=19457 --- debian/changelog | 8 ++++++++ debian/installer/modules/scsi-extra-modules | 1 + 2 files changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index 6a54ec0ad..a1329c355 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +linux (3.2.32-2) UNRELEASED; urgency=low + + * [x86] udeb: Re-add isci to scsi-extra-modules (Closes: #690886; + regression of #652897 in version 3.2~rc7-1~experimental.1 due to + mis-merge) + + -- Ben Hutchings Wed, 24 Oct 2012 14:15:57 +0100 + linux (3.2.32-1) unstable; urgency=low * New upstream stable update: diff --git a/debian/installer/modules/scsi-extra-modules b/debian/installer/modules/scsi-extra-modules index 5fa68cbd7..ee03ecd18 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 ?