summaryrefslogtreecommitdiffstats
path: root/kernel-x86_64-debug-rhel.config
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-06-17 17:35:18 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2021-06-17 17:35:18 +0200
commit788e62fae86e28be8077e5bb62625ee8b0425f81 (patch)
tree71ae2ff36eec16ecd8da01f41e493063ae6e7984 /kernel-x86_64-debug-rhel.config
parent70729eacc5c9a469a47f4ef95dc4791610da5ba3 (diff)
parent124eb98dad29a958da9c4a41e456b160c988ac8e (diff)
downloadkernel-788e62fae86e28be8077e5bb62625ee8b0425f81.tar.gz
kernel-788e62fae86e28be8077e5bb62625ee8b0425f81.tar.xz
kernel-788e62fae86e28be8077e5bb62625ee8b0425f81.zip
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.13.0-0.rc6.20210617git70585216fe77.48.vanilla.1.fc34
Diffstat (limited to 'kernel-x86_64-debug-rhel.config')
-rw-r--r--kernel-x86_64-debug-rhel.config4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index c9a767cd4..4a11f4a4e 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -1000,7 +1000,8 @@ CONFIG_CUSE=m
# CONFIG_CX_ECAT is not set
CONFIG_CXL_BIMODAL=y
CONFIG_CXL_BUS=y
-# CONFIG_CXL_MEM is not set
+CONFIG_CXL_MEM=m
+# CONFIG_CXL_MEM_RAW_COMMANDS is not set
CONFIG_CYCLADES=m
# CONFIG_CYZ_INTR is not set
# CONFIG_DA280 is not set
@@ -3009,7 +3010,6 @@ CONFIG_MDIO_MSCC_MIIM=m
# CONFIG_MDIO_MVUSB is not set
CONFIG_MDIO_OCTEON=m
CONFIG_MDIO_THUNDER=m
-# CONFIG_MDIO_XPCS is not set
CONFIG_MD_LINEAR=m
# CONFIG_MD_MULTIPATH is not set
CONFIG_MD_RAID0=m