Merge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

This commit is contained in:
Linus Torvalds 2005-07-31 16:48:39 -07:00
commit e0b98c79e6

View file

@ -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