aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/Kconfig
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-06-22 22:51:46 -0400
committerJeff Garzik <jeff@garzik.org>2006-06-22 22:51:46 -0400
commitdbe1ab9514c231c9b062140a107d9dea0eabefcc (patch)
tree0001c7143cf923fc704215f0a0e54221e9e5cbb9 /drivers/scsi/Kconfig
parent[PATCH] s2io: netpoll support (diff)
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6 (diff)
downloadlinux-dev-dbe1ab9514c231c9b062140a107d9dea0eabefcc.tar.xz
linux-dev-dbe1ab9514c231c9b062140a107d9dea0eabefcc.zip
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/scsi/Kconfig')
-rw-r--r--drivers/scsi/Kconfig10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index a480a3742d47..44728ae3fe77 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -532,6 +532,16 @@ config SCSI_PDC_ADMA
If unsure, say N.
+config SCSI_HPTIOP
+ tristate "HighPoint RocketRAID 3xxx Controller support"
+ depends on SCSI && PCI
+ help
+ This option enables support for HighPoint RocketRAID 3xxx
+ controllers.
+
+ To compile this driver as a module, choose M here; the module
+ will be called hptiop. If unsure, say N.
+
config SCSI_SATA_QSTOR
tristate "Pacific Digital SATA QStor support"
depends on SCSI_SATA && PCI