diff --git a/arch/x86/configs/tencent.config b/arch/x86/configs/tencent.config index ed6c1c9f38c7bfd43481c0ff90d4968b31e982a8..8c199224f13036bf23bdbf31f7be3243ce6ddfc5 100644 --- a/arch/x86/configs/tencent.config +++ b/arch/x86/configs/tencent.config @@ -11,7 +11,6 @@ CONFIG_BSD_PROCESS_ACCT_V3=y CONFIG_TASK_XACCT=y CONFIG_TASK_IO_ACCOUNTING=y CONFIG_PSI=y -CONFIG_PSI_DEFAULT_DISABLED=y CONFIG_RQM=y CONFIG_PSI_DEFAULT_DISABLED=y CONFIG_IKHEADERS=m @@ -689,6 +688,7 @@ CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_MM=y CONFIG_MEGARAID_MAILBOX=y CONFIG_MEGARAID_LEGACY=y +CONFIG_SCSI_PS3STOR=m CONFIG_SCSI_UFSHCD=y CONFIG_SCSI_UFSHCD_PCI=y CONFIG_SCSI_HPTIOP=y @@ -874,10 +874,6 @@ CONFIG_IGBVF=m CONFIG_IXGB=m CONFIG_FM10K=m CONFIG_IGC=m -CONFIG_NGBE=m -CONFIG_TXGBE=m -CONFIG_SXE=m -CONFIG_SXE_VF=m CONFIG_JME=m CONFIG_MVMDIO=m CONFIG_SKGE=m @@ -893,6 +889,8 @@ CONFIG_MLX5_EN_IPSEC=y CONFIG_MLX5_TLS=y CONFIG_MLXSW_CORE=m # CONFIG_NET_VENDOR_MICREL is not set +CONFIG_MXGBE=m +CONFIG_MGBE=m CONFIG_MYRI10GE=m # CONFIG_NET_VENDOR_NATSEMI is not set CONFIG_NFP=m @@ -923,6 +921,8 @@ CONFIG_SMSC9420=m # CONFIG_NET_VENDOR_TI is not set # CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_WIZNET is not set +CONFIG_NGBE=m +CONFIG_TXGBE=m CONFIG_MDIO_BCM_UNIMAC=m CONFIG_MDIO_BITBANG=m CONFIG_MDIO_MSCC_MIIM=m @@ -1307,7 +1307,6 @@ CONFIG_THIRDPARTY_MPT3SAS=m CONFIG_THIRDPARTY_SMARTPQI=m CONFIG_THIRDPARTY_LPFC=m CONFIG_THIRDPARTY_MEGARAID_SAS=m -CONFIG_SCSI_PS3STOR=m CONFIG_EXT2_FS=y CONFIG_EXT2_FS_XATTR=y CONFIG_EXT2_FS_POSIX_ACL=y