aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2017-04-08 01:36:11 +0100
committerBen Hutchings <ben@decadent.org.uk>2017-04-08 01:43:00 +0100
commitca91ae2eb7da09bd88f0d3322e1cebe3307b972b (patch)
tree60625a63222ca6d2c1347db0101da8fa7f21b7f3
parent20a0659e2404a7e74da6997e927bdca5daa277a6 (diff)
downloadkernel_replicant_linux-ca91ae2eb7da09bd88f0d3322e1cebe3307b972b.tar.gz
kernel_replicant_linux-ca91ae2eb7da09bd88f0d3322e1cebe3307b972b.tar.bz2
kernel_replicant_linux-ca91ae2eb7da09bd88f0d3322e1cebe3307b972b.zip
[powerpc/powerpc64,ppc64*] target: Enable SCSI_IBMVSCSIS as module
This driver was removed in 3.18, but has been updated to use the new target framework and was added again in 4.8. As it lives under drivers/scsi and not drivers/target, exclude it from the scsi-modules udeb.
-rw-r--r--debian/changelog1
-rw-r--r--debian/config/kernelarch-powerpc/config-arch-641
-rw-r--r--debian/installer/powerpc/modules/powerpc-powerpc64/scsi-modules3
3 files changed, 5 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 4d0e56edf07d..b49679b87b2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ linux (4.9.18-2) UNRELEASED; urgency=medium
* [x86] usbip: Increase USBIP_VHCI_NR_HCS to 8 and USBIP_VHCI_HC_PORTS to 31
(Closes: #859641)
* drm/nouveau/disp/mcp7x: disable dptmds workaround (Closes: #850219)
+ * [powerpc/powerpc64,ppc64*] target: Enable SCSI_IBMVSCSIS as module
-- Ben Hutchings <ben@decadent.org.uk> Thu, 30 Mar 2017 18:27:30 +0100
diff --git a/debian/config/kernelarch-powerpc/config-arch-64 b/debian/config/kernelarch-powerpc/config-arch-64
index ac68835f6389..1adb2a6210a1 100644
--- a/debian/config/kernelarch-powerpc/config-arch-64
+++ b/debian/config/kernelarch-powerpc/config-arch-64
@@ -130,6 +130,7 @@ CONFIG_HOTPLUG_PCI_RPA_DLPAR=m
## file: drivers/scsi/Kconfig
##
CONFIG_SCSI_IBMVSCSI=m
+CONFIG_SCSI_IBMVSCSIS=m
CONFIG_SCSI_IBMVFC=m
CONFIG_SCSI_QLOGIC_1280=m
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/scsi-modules b/debian/installer/powerpc/modules/powerpc-powerpc64/scsi-modules
index 62f9ed24d0e9..d0671e575e57 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/scsi-modules
+++ b/debian/installer/powerpc/modules/powerpc-powerpc64/scsi-modules
@@ -3,3 +3,6 @@
ibmvscsi
ps3disk ?
ps3rom
+
+# Exclude target driver
+ibmvscsis -