Skip to content

Commit

Permalink
Merge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kerne…
Browse files Browse the repository at this point in the history
…l/git/jgarzik/libata-dev
  • Loading branch information
Linus Torvalds committed Jul 31, 2005
2 parents 02459ea + faa7253 commit e0b98c7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/scsi/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e0b98c7

Please sign in to comment.