diff options
| author | David S. Miller <davem@davemloft.net> | 2011-10-07 13:38:43 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-10-07 13:38:43 -0400 |
| commit | 88c5100c28b02c4b2b2c6f6fafbbd76d90f698b9 (patch) | |
| tree | 08c4399e0341f7eb0ccb24e15f2cab687275c2a4 /drivers/scsi/Kconfig | |
| parent | 8083f0fc969d9b5353061a7a6f963405057e26b1 (diff) | |
| parent | 3ee72ca99288f1de95ec9c570e43f531c8799f06 (diff) | |
| download | blackbird-op-linux-88c5100c28b02c4b2b2c6f6fafbbd76d90f698b9.tar.gz blackbird-op-linux-88c5100c28b02c4b2b2c6f6fafbbd76d90f698b9.zip | |
Merge branch 'master' of github.com:davem330/net
Conflicts:
net/batman-adv/soft-interface.c
Diffstat (limited to 'drivers/scsi/Kconfig')
| -rw-r--r-- | drivers/scsi/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 8d9dae89f065..3878b7395081 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig @@ -837,6 +837,7 @@ config SCSI_ISCI # (temporary): known alpha quality driver depends on EXPERIMENTAL select SCSI_SAS_LIBSAS + select SCSI_SAS_HOST_SMP ---help--- This driver supports the 6Gb/s SAS capabilities of the storage control unit found in the Intel(R) C600 series chipset. |
