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

+1 -1
+1 -1
drivers/scsi/Kconfig
··· 424 source "drivers/scsi/megaraid/Kconfig.megaraid" 425 426 config SCSI_SATA 427 - bool "Serial ATA (SATA) support" 428 depends on SCSI 429 help 430 This driver family supports Serial ATA host controllers
··· 424 source "drivers/scsi/megaraid/Kconfig.megaraid" 425 426 config SCSI_SATA 427 + tristate "Serial ATA (SATA) support" 428 depends on SCSI 429 help 430 This driver family supports Serial ATA host controllers