summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-31 16:48:39 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-31 16:48:39 -0700
commite0b98c79e605f64f263ede53344f283f5e0548be (patch)
treed6a266d1d3f97d0e996a402c58810680a584ac7a
parent02459eaab98a6a57717bc0cacede148fc76af881 (diff)
parentfaa725332f39329288f52b7f872ffda866ba5b09 (diff)
downloadconfigs-e0b98c79e605f64f263ede53344f283f5e0548be.tar.gz
Merge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
-rw-r--r--drivers/scsi/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 96df148ed96..f1e8c4223ed 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -424,7 +424,7 @@ config SCSI_IN2000
source "drivers/scsi/megaraid/Kconfig.megaraid"
config SCSI_SATA
- bool "Serial ATA (SATA) support"
+ tristate "Serial ATA (SATA) support"
depends on SCSI
help
This driver family supports Serial ATA host controllers