Commit e0b98c79 authored by Linus Torvalds's avatar Linus Torvalds

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

parents 02459eaa faa72533
...@@ -424,7 +424,7 @@ config SCSI_IN2000 ...@@ -424,7 +424,7 @@ config SCSI_IN2000
source "drivers/scsi/megaraid/Kconfig.megaraid" source "drivers/scsi/megaraid/Kconfig.megaraid"
config SCSI_SATA config SCSI_SATA
bool "Serial ATA (SATA) support" tristate "Serial ATA (SATA) support"
depends on SCSI depends on SCSI
help help
This driver family supports Serial ATA host controllers This driver family supports Serial ATA host controllers
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment