summaryrefslogtreecommitdiff
path: root/packages/linux-kernel
diff options
context:
space:
mode:
authordd <dd@wx.tnyzeq.icu>2024-08-26 18:00:11 +0200
committerdd <dd@wx.tnyzeq.icu>2024-08-26 18:00:11 +0200
commit384122e82f78df72e8cfe058565e684ec31aa66f (patch)
treedbddc4c468b983f2fed7401451b20a29cf9a7acd /packages/linux-kernel
parent88cb93be126dcadc54acc8e0b71304c2efb8d325 (diff)
parent70bb3c5baacb6e0c72b9532f6dda417d395a6bc0 (diff)
downloadvyos-build-384122e82f78df72e8cfe058565e684ec31aa66f.tar.gz
vyos-build-384122e82f78df72e8cfe058565e684ec31aa66f.zip
Merge branch 'vyos:current' into current
Diffstat (limited to 'packages/linux-kernel')
-rw-r--r--packages/linux-kernel/arch/arm64/configs/vyos_defconfig3
-rw-r--r--packages/linux-kernel/arch/x86/configs/vyos_defconfig3
2 files changed, 4 insertions, 2 deletions
diff --git a/packages/linux-kernel/arch/arm64/configs/vyos_defconfig b/packages/linux-kernel/arch/arm64/configs/vyos_defconfig
index 11abca82..7b49f05f 100644
--- a/packages/linux-kernel/arch/arm64/configs/vyos_defconfig
+++ b/packages/linux-kernel/arch/arm64/configs/vyos_defconfig
@@ -6053,7 +6053,8 @@ CONFIG_THUNDERX2_PMU=m
# end of Performance monitor support
CONFIG_RAS=y
-# CONFIG_USB4 is not set
+CONFIG_USB4=m
+CONFIG_USB4_NET=m
#
# Android
diff --git a/packages/linux-kernel/arch/x86/configs/vyos_defconfig b/packages/linux-kernel/arch/x86/configs/vyos_defconfig
index 767058a8..7f513878 100644
--- a/packages/linux-kernel/arch/x86/configs/vyos_defconfig
+++ b/packages/linux-kernel/arch/x86/configs/vyos_defconfig
@@ -5315,7 +5315,8 @@ CONFIG_IDLE_INJECT=y
CONFIG_RAS=y
# CONFIG_RAS_CEC is not set
-# CONFIG_USB4 is not set
+CONFIG_USB4=m
+CONFIG_USB4_NET=m
#
# Android