sugar/linux
1
0
Fork 0
Code Activity

Merge branch 'master'

Browse Source
This commit is contained in:
Jeff Garzik
2005-10-18 17:16:06 -04:00
parent dd4efa44eb 39ca371c45
commit 5a476deff3
59 changed files with 501 additions and 567 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/scsi/Kconfig
View File

@@ -569,6 +569,11 @@ config SCSI_SATA_VITESSE
If unsure, say N.
config SCSI_SATA_INTEL_COMBINED
bool
depends on IDE=y && !BLK_DEV_IDE_SATA && (SCSI_SATA_AHCI || SCSI_ATA_PIIX)
default y
config SCSI_BUSLOGIC
tristate "BusLogic SCSI support"
depends on (PCI || ISA || MCA) && SCSI && ISA_DMA_API