diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-12-04 18:10:47 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-12-04 18:10:47 +0100 |
commit | f1eff899041d03a2a65502bc7dc965965f0c8dd9 (patch) | |
tree | b95b4080186b6ae5a47bb4ff8c4bc7acc8924c5e /kernel-armv7hl-fedora.config | |
parent | 89a239d8e82eec53a770db2bd54e1675611f66c3 (diff) | |
parent | 746134539062becfb22e9b79f40e9348c9ffb484 (diff) | |
download | kernel-f1eff899041d03a2a65502bc7dc965965f0c8dd9.tar.gz kernel-f1eff899041d03a2a65502bc7dc965965f0c8dd9.tar.xz kernel-f1eff899041d03a2a65502bc7dc965965f0c8dd9.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.5.0-0.rc0.git5.1.vanilla.knurd.1.fc32kernel-5.5.0-0.rc0.git5.1.vanilla.knurd.1.fc31kernel-5.5.0-0.rc0.git5.1.vanilla.knurd.1.fc30
Diffstat (limited to 'kernel-armv7hl-fedora.config')
-rw-r--r-- | kernel-armv7hl-fedora.config | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index ebb7f3498..732ed8bd7 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -1087,6 +1087,7 @@ CONFIG_CROS_EC_ISHTP=m CONFIG_CROS_EC=m CONFIG_CROS_EC_PROTO=y CONFIG_CROS_EC_RPMSG=m +CONFIG_CROS_EC_SENSORHUB=m CONFIG_CROS_EC_SPI=m CONFIG_CROS_EC_SYSFS=m CONFIG_CROS_EC_VBC=m @@ -4532,6 +4533,8 @@ CONFIG_PCIEASPM_DEFAULT=y CONFIG_PCIEASPM=y # CONFIG_PCIE_BW is not set CONFIG_PCIE_CADENCE_HOST=y +CONFIG_PCIE_CADENCE_PLAT_EP=y +CONFIG_PCIE_CADENCE_PLAT_HOST=y CONFIG_PCIE_DPC=y CONFIG_PCIE_DW_HOST=y CONFIG_PCIE_DW_PLAT_HOST=y @@ -6998,11 +7001,11 @@ CONFIG_USB_DWC3_ULPI=y # CONFIG_USB_EG20T is not set CONFIG_USB_EHCI_EXYNOS=m # CONFIG_USB_EHCI_FSL is not set -CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_HCD_OMAP=m CONFIG_USB_EHCI_HCD_ORION=m CONFIG_USB_EHCI_HCD_PLATFORM=m CONFIG_USB_EHCI_HCD_STI=m +CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_MV=m # CONFIG_USB_EHCI_MV_U2O is not set CONFIG_USB_EHCI_MXC=m |