diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-07-18 10:08:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-18 10:08:00 +0200 |
| commit | 97f56f8ff7b8e130935f163263070619c491e25e (patch) | |
| tree | c5c322f0aae9300073927d10160a3e1efd143816 | |
| parent | 5ae4b817ea4fde67232e29602a5afa3269b88679 (diff) | |
| parent | 2a3ad403f6a069f2b1e3ef32ab3aef9b66eb3595 (diff) | |
| download | vyos-build-97f56f8ff7b8e130935f163263070619c491e25e.tar.gz vyos-build-97f56f8ff7b8e130935f163263070619c491e25e.zip | |
Merge pull request #700 from vyos/mergify/bp/circinus/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 e6eeb31f..12701194 100644 --- a/data/defaults.toml +++ b/data/defaults.toml @@ -14,7 +14,7 @@ vyos_mirror = "https://rolling-packages.vyos.net/current" vyos_branch = "current" release_train = "current" -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 |