Merge /spare/repo/linux-2.6/
This commit is contained in:
@@ -1,5 +1,11 @@
|
||||
menu "SCSI device support"
|
||||
|
||||
config RAID_ATTRS
|
||||
tristate "RAID Transport Class"
|
||||
default n
|
||||
---help---
|
||||
Provides RAID
|
||||
|
||||
config SCSI
|
||||
tristate "SCSI device support"
|
||||
---help---
|
||||
@@ -250,7 +256,7 @@ config SCSI_DECNCR
|
||||
|
||||
config SCSI_DECSII
|
||||
tristate "DEC SII Scsi Driver"
|
||||
depends on MACH_DECSTATION && SCSI && MIPS32
|
||||
depends on MACH_DECSTATION && SCSI && 32BIT
|
||||
|
||||
config BLK_DEV_3W_XXXX_RAID
|
||||
tristate "3ware 5/6/7/8xxx ATA-RAID support"
|
||||
@@ -459,6 +465,15 @@ config SCSI_ATA_PIIX
|
||||
|
||||
If unsure, say N.
|
||||
|
||||
config SCSI_SATA_MV
|
||||
tristate "Marvell SATA support"
|
||||
depends on SCSI_SATA && PCI && EXPERIMENTAL
|
||||
help
|
||||
This option enables support for the Marvell Serial ATA family.
|
||||
Currently supports 88SX[56]0[48][01] chips.
|
||||
|
||||
If unsure, say N.
|
||||
|
||||
config SCSI_SATA_NV
|
||||
tristate "NVIDIA SATA support"
|
||||
depends on SCSI_SATA && PCI && EXPERIMENTAL
|
||||
|
||||
Reference in New Issue
Block a user