summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/megaraid/Kconfig.megaraid
diff options
context:
space:
mode:
authorDave Airlie <airlied@starflyer.(none)>2005-10-20 18:21:33 +1000
committerDave Airlie <airlied@linux.ie>2005-10-20 18:21:33 +1000
commit312f5726055534be1dc9dd369be13aabd2943fcb (patch)
tree29394a3f83b4952a73b36a4aa962dfeda839e9db /drivers/scsi/megaraid/Kconfig.megaraid
parent3d5efad953c6d5ba11d5bcb584ef8e906f953a73 (diff)
parent93918e9afc76717176e9e114e79cdbb602a45ae8 (diff)
downloadblackbird-op-linux-312f5726055534be1dc9dd369be13aabd2943fcb.tar.gz
blackbird-op-linux-312f5726055534be1dc9dd369be13aabd2943fcb.zip
merge Linus head tree into my drm tree and fix up conflicts
Diffstat (limited to 'drivers/scsi/megaraid/Kconfig.megaraid')
-rw-r--r--drivers/scsi/megaraid/Kconfig.megaraid9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/scsi/megaraid/Kconfig.megaraid b/drivers/scsi/megaraid/Kconfig.megaraid
index 917d591d90b2..7363e12663ac 100644
--- a/drivers/scsi/megaraid/Kconfig.megaraid
+++ b/drivers/scsi/megaraid/Kconfig.megaraid
@@ -76,3 +76,12 @@ config MEGARAID_LEGACY
To compile this driver as a module, choose M here: the
module will be called megaraid
endif
+
+config MEGARAID_SAS
+ tristate "LSI Logic MegaRAID SAS RAID Module"
+ depends on PCI && SCSI
+ help
+ Module for LSI Logic's SAS based RAID controllers.
+ To compile this driver as a module, choose 'm' here.
+ Module will be called megaraid_sas
+
OpenPOWER on IntegriCloud