diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-31 19:48:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-31 19:48:39 -0400 |
| commit | e0b98c79e605f64f263ede53344f283f5e0548be (patch) | |
| tree | d6a266d1d3f97d0e996a402c58810680a584ac7a /drivers | |
| parent | 02459eaab98a6a57717bc0cacede148fc76af881 (diff) | |
| parent | faa725332f39329288f52b7f872ffda866ba5b09 (diff) | |
Merge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 96df148ed969..f1e8c4223ed1 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig | |||
| @@ -424,7 +424,7 @@ config SCSI_IN2000 | |||
| 424 | source "drivers/scsi/megaraid/Kconfig.megaraid" | 424 | source "drivers/scsi/megaraid/Kconfig.megaraid" |
| 425 | 425 | ||
| 426 | config SCSI_SATA | 426 | config SCSI_SATA |
| 427 | bool "Serial ATA (SATA) support" | 427 | tristate "Serial ATA (SATA) support" |
| 428 | depends on SCSI | 428 | depends on SCSI |
| 429 | help | 429 | help |
| 430 | This driver family supports Serial ATA host controllers | 430 | This driver family supports Serial ATA host controllers |