Skip to content

Commit d153ec8

Browse files
committed
Merge pull request #2723 from flatcar/scripts
coreos-modules: move mana kmod to commonconfig
2 parents 7f692a4 + 4bee2e4 commit d153ec8

File tree

2 files changed

+1
-1
lines changed

2 files changed

+1
-1
lines changed

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-6.6

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ CONFIG_MEMORY_FAILURE=y
8181
CONFIG_MEMORY_HOTPLUG=y
8282
CONFIG_MEMORY_HOTREMOVE=y
8383
CONFIG_MEM_SOFT_DIRTY=y
84-
CONFIG_MICROSOFT_MANA=m
8584
CONFIG_MMC_SDHCI_ACPI=m
8685
# CONFIG_MOUSE_PS2_LIFEBOOK is not set
8786
CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,7 @@ CONFIG_MEGARAID_NEWGEN=y
442442
CONFIG_MEGARAID_SAS=m
443443
CONFIG_MEMCG=y
444444
CONFIG_MEMTEST=y
445+
CONFIG_MICROSOFT_MANA=m
445446
CONFIG_MINIX_SUBPARTITION=y
446447
# CONFIG_MLX4_DEBUG is not set
447448
CONFIG_MLX4_EN=m

0 commit comments

Comments
 (0)