Add changes from the Linux-2.6 tree.

[linux-2.6.git] / drivers / scsi / megaraid / Kconfig.megaraid

diff --git a/drivers/scsi/megaraid/Kconfig.megaraid b/drivers/scsi/megaraid/Kconfig.megaraid
index 97c7a76..17419e3 100644 (file)
--- a/drivers/scsi/megaraid/Kconfig.megaraid
+++ b/drivers/scsi/megaraid/Kconfig.megaraid
@@ -59,11 +59,11 @@ config MEGARAID_MAILBOX
        INTEL RAID Controller SRCU51L   1000:1960:8086:0520
        FSC MegaRAID PCI Express ROMB   1000:0408:1734:1065
        ACER MegaRAID ROMB-2E           1000:0408:1025:004D
+       NEC MegaRAID PCI Express ROMB   1000:0408:1033:8287
 
        To compile this driver as a module, choose M here: the
        module will be called megaraid_mbox
 
-if MEGARAID_NEWGEN=n
 config MEGARAID_LEGACY
        tristate "LSI Logic Legacy MegaRAID Driver"
        depends on PCI && SCSI
@@ -74,4 +74,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
+