diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-07-22 18:08:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-22 18:08:52 +0200 |
| commit | 019054fc172e98476635e19f62d381ee1146850e (patch) | |
| tree | 57476a9960bfafcf187b3f58b3958ee35f39efdc | |
| parent | 8e64f27ec35ee636ebbbf0ac1eb54387ef1eb5f5 (diff) | |
| parent | b82ee4f48b837ade6509286680cb147b5a8eced9 (diff) | |
| download | vyos-build-019054fc172e98476635e19f62d381ee1146850e.tar.gz vyos-build-019054fc172e98476635e19f62d381ee1146850e.zip | |
Merge pull request #701 from vyos/mergify/bp/sagitta/pr-699
T6584: Revert "T6293: add Mediatek MT7921 to defconfig" (backport #699)
| -rw-r--r-- | data/defaults.toml | 2 | ||||
| -rw-r--r-- | packages/linux-kernel/arch/x86/configs/vyos_defconfig | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/data/defaults.toml b/data/defaults.toml index 16f009dd..47619cfc 100644 --- a/data/defaults.toml +++ b/data/defaults.toml @@ -14,7 +14,7 @@ vyos_mirror = "http://dev.packages.vyos.net/repositories/sagitta" vyos_branch = "sagitta" release_train = "sagitta" -kernel_version = "6.6.39" +kernel_version = "6.6.40" bootloaders = "syslinux,grub-efi" squashfs_compression_type = "xz -Xbcj x86 -b 256k -always-use-fragments -no-recovery" diff --git a/packages/linux-kernel/arch/x86/configs/vyos_defconfig b/packages/linux-kernel/arch/x86/configs/vyos_defconfig index fbf0c88d..767058a8 100644 --- a/packages/linux-kernel/arch/x86/configs/vyos_defconfig +++ b/packages/linux-kernel/arch/x86/configs/vyos_defconfig @@ -2987,9 +2987,9 @@ CONFIG_MT7663_USB_SDIO_COMMON=m CONFIG_MT7663U=m CONFIG_MT7663S=m CONFIG_MT7915E=m -CONFIG_MT7921E=m -CONFIG_MT7921S=m -CONFIG_MT7921U=m +# CONFIG_MT7921E is not set +# CONFIG_MT7921S is not set +# CONFIG_MT7921U is not set # CONFIG_MT7996E is not set CONFIG_WLAN_VENDOR_MICROCHIP=y # CONFIG_WILC1000_SDIO is not set |