Merge pull request #191 from marineam/scsi

fix(sys-kernel/coreos-kernel): Add assorted SCSI adapters for VMware.
This commit is contained in:
Greg Kroah-Hartman 2013-09-01 17:34:48 -07:00
commit 42a4afc7d6
2 changed files with 18 additions and 13 deletions

View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/x86 3.10.9 Kernel Configuration # Linux/x86 3.10.10 Kernel Configuration
# #
CONFIG_64BIT=y CONFIG_64BIT=y
CONFIG_X86_64=y CONFIG_X86_64=y
@ -1144,7 +1144,7 @@ CONFIG_HAVE_IDE=y
# SCSI device support # SCSI device support
# #
CONFIG_SCSI_MOD=y CONFIG_SCSI_MOD=y
CONFIG_RAID_ATTRS=m CONFIG_RAID_ATTRS=y
CONFIG_SCSI=y CONFIG_SCSI=y
CONFIG_SCSI_DMA=y CONFIG_SCSI_DMA=y
# CONFIG_SCSI_TGT is not set # CONFIG_SCSI_TGT is not set
@ -1158,8 +1158,8 @@ CONFIG_BLK_DEV_SD=y
# CONFIG_CHR_DEV_ST is not set # CONFIG_CHR_DEV_ST is not set
# CONFIG_CHR_DEV_OSST is not set # CONFIG_CHR_DEV_OSST is not set
CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR=y
CONFIG_BLK_DEV_SR_VENDOR=y # CONFIG_BLK_DEV_SR_VENDOR is not set
CONFIG_CHR_DEV_SG=y CONFIG_CHR_DEV_SG=m
# CONFIG_CHR_DEV_SCH is not set # CONFIG_CHR_DEV_SCH is not set
CONFIG_SCSI_MULTI_LUN=y CONFIG_SCSI_MULTI_LUN=y
CONFIG_SCSI_CONSTANTS=y CONFIG_SCSI_CONSTANTS=y
@ -1169,10 +1169,10 @@ CONFIG_SCSI_SCAN_ASYNC=y
# #
# SCSI Transports # SCSI Transports
# #
# CONFIG_SCSI_SPI_ATTRS is not set CONFIG_SCSI_SPI_ATTRS=y
# CONFIG_SCSI_FC_ATTRS is not set # CONFIG_SCSI_FC_ATTRS is not set
CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_ISCSI_ATTRS=m
CONFIG_SCSI_SAS_ATTRS=m CONFIG_SCSI_SAS_ATTRS=y
# CONFIG_SCSI_SAS_LIBSAS is not set # CONFIG_SCSI_SAS_LIBSAS is not set
# CONFIG_SCSI_SRP_ATTRS is not set # CONFIG_SCSI_SRP_ATTRS is not set
CONFIG_SCSI_LOWLEVEL=y CONFIG_SCSI_LOWLEVEL=y
@ -1201,16 +1201,16 @@ CONFIG_SCSI_HPSA=m
# CONFIG_MEGARAID_NEWGEN is not set # CONFIG_MEGARAID_NEWGEN is not set
# CONFIG_MEGARAID_LEGACY is not set # CONFIG_MEGARAID_LEGACY is not set
# CONFIG_MEGARAID_SAS is not set # CONFIG_MEGARAID_SAS is not set
CONFIG_SCSI_MPT2SAS=m CONFIG_SCSI_MPT2SAS=y
CONFIG_SCSI_MPT2SAS_MAX_SGE=128 CONFIG_SCSI_MPT2SAS_MAX_SGE=128
# CONFIG_SCSI_MPT2SAS_LOGGING is not set # CONFIG_SCSI_MPT2SAS_LOGGING is not set
CONFIG_SCSI_MPT3SAS=m CONFIG_SCSI_MPT3SAS=y
CONFIG_SCSI_MPT3SAS_MAX_SGE=128 CONFIG_SCSI_MPT3SAS_MAX_SGE=128
# CONFIG_SCSI_MPT3SAS_LOGGING is not set # CONFIG_SCSI_MPT3SAS_LOGGING is not set
# CONFIG_SCSI_UFSHCD is not set # CONFIG_SCSI_UFSHCD is not set
# CONFIG_SCSI_HPTIOP is not set # CONFIG_SCSI_HPTIOP is not set
# CONFIG_SCSI_BUSLOGIC is not set CONFIG_SCSI_BUSLOGIC=y
CONFIG_VMWARE_PVSCSI=m CONFIG_VMWARE_PVSCSI=y
CONFIG_HYPERV_STORAGE=m CONFIG_HYPERV_STORAGE=m
# CONFIG_LIBFC is not set # CONFIG_LIBFC is not set
# CONFIG_LIBFCOE is not set # CONFIG_LIBFCOE is not set
@ -1225,7 +1225,11 @@ CONFIG_HYPERV_STORAGE=m
# CONFIG_SCSI_INITIO is not set # CONFIG_SCSI_INITIO is not set
# CONFIG_SCSI_INIA100 is not set # CONFIG_SCSI_INIA100 is not set
# CONFIG_SCSI_STEX is not set # CONFIG_SCSI_STEX is not set
# CONFIG_SCSI_SYM53C8XX_2 is not set CONFIG_SCSI_SYM53C8XX_2=y
CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
CONFIG_SCSI_SYM53C8XX_MMIO=y
# CONFIG_SCSI_IPR is not set # CONFIG_SCSI_IPR is not set
# CONFIG_SCSI_QLOGIC_1280 is not set # CONFIG_SCSI_QLOGIC_1280 is not set
# CONFIG_SCSI_QLA_FC is not set # CONFIG_SCSI_QLA_FC is not set
@ -1375,10 +1379,11 @@ CONFIG_DM_UEVENT=y
# CONFIG_DM_VERITY is not set # CONFIG_DM_VERITY is not set
# CONFIG_TARGET_CORE is not set # CONFIG_TARGET_CORE is not set
CONFIG_FUSION=y CONFIG_FUSION=y
# CONFIG_FUSION_SPI is not set CONFIG_FUSION_SPI=y
# CONFIG_FUSION_FC is not set # CONFIG_FUSION_FC is not set
# CONFIG_FUSION_SAS is not set CONFIG_FUSION_SAS=y
CONFIG_FUSION_MAX_SGE=40 CONFIG_FUSION_MAX_SGE=40
CONFIG_FUSION_CTL=m
CONFIG_FUSION_LOGGING=y CONFIG_FUSION_LOGGING=y
# #