Merge pull request #2797 from MilhouseVH/linux4175

linux (Generic): update to linux-4.17.5
This commit is contained in:
Christian Hewitt 2018-06-26 05:32:42 +04:00 committed by GitHub
commit 37b2f6feac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86_64 4.17.0 Kernel Configuration
# Linux/x86_64 4.17.2 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@ -1386,6 +1386,7 @@ CONFIG_NVME_MULTIPATH=y
# CONFIG_USB_SWITCH_FSA9480 is not set
# CONFIG_SRAM is not set
# CONFIG_PCI_ENDPOINT_TEST is not set
CONFIG_MISC_RTSX=y
# CONFIG_C2PORT is not set
#
@ -1449,8 +1450,8 @@ CONFIG_ALTERA_STAPL=m
#
# CONFIG_GENWQE is not set
# CONFIG_ECHO is not set
# CONFIG_MISC_RTSX_PCI is not set
# CONFIG_MISC_RTSX_USB is not set
CONFIG_MISC_RTSX_PCI=y
CONFIG_MISC_RTSX_USB=y
CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set
@ -4294,6 +4295,8 @@ CONFIG_MMC_SDHCI_PLTFM=y
# CONFIG_MMC_VUB300 is not set
# CONFIG_MMC_USHC is not set
# CONFIG_MMC_USDHI6ROL0 is not set
CONFIG_MMC_REALTEK_PCI=y
CONFIG_MMC_REALTEK_USB=y
CONFIG_MMC_CQHCI=y
CONFIG_MMC_TOSHIBA_PCI=y
# CONFIG_MMC_MTK is not set