summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@HansenPartnership.com>2015-12-02 13:36:58 -0800
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2015-12-03 09:31:23 -0800
commit3ddda3e4c82dea58933bde8d0f6ef34470c360cb (patch)
treea399528cfefa28922ba5ffd4236b918c800b9cec
parentb840c3627b6f4f856b333a14a72f8ed86da2f86c (diff)
downloadlinux-stable-3ddda3e4c82dea58933bde8d0f6ef34470c360cb.tar.gz
linux-stable-3ddda3e4c82dea58933bde8d0f6ef34470c360cb.tar.bz2
linux-stable-3ddda3e4c82dea58933bde8d0f6ef34470c360cb.zip
mpt3sas: fix Kconfig dependency problem for mpt2sas back compatibility
The non-PCI builds of the O day test project are failing: On Thu, 2015-12-03 at 05:02 +0800, kbuild test robot wrote: > warning: (SCSI_MPT2SAS) selects SCSI_MPT3SAS which has unmet direct > dependencies (SCSI_LOWLEVEL && PCI && SCSI) The problem is that select and depend don't interact because Kconfig doesn't have a SAT solver, so depend picks up dependencies and select does onward selects, but select doesn't pick up dependencies. To fix this, we need to add the correct dependencies to the MPT2SAS option like this. Reported-by: kbuild test robot <fengguang.wu@intel.com> Fixes: b840c3627b6f4f856b333a14a72f8ed86da2f86c Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
-rw-r--r--drivers/scsi/mpt3sas/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/mpt3sas/Kconfig b/drivers/scsi/mpt3sas/Kconfig
index 25dc38f25ec6..b736dbc80485 100644
--- a/drivers/scsi/mpt3sas/Kconfig
+++ b/drivers/scsi/mpt3sas/Kconfig
@@ -76,6 +76,7 @@ config SCSI_MPT2SAS
tristate "Legacy MPT2SAS config option"
default n
select SCSI_MPT3SAS
+ depends on PCI && SCSI
---help---
Dummy config option for backwards compatiblity: configure the MPT3SAS
driver instead.