diff options
| author | Tim Steinbach <tim@nequissimus.com> | 2020-06-15 11:10:00 -0400 |
|---|---|---|
| committer | Tim Steinbach <tim@nequissimus.com> | 2020-06-15 11:10:17 -0400 |
| commit | 5953625fa5235f3b947cc4d884b138f0ca4c475b (patch) | |
| tree | b526f4c7d1da418a55c0e46cb6cfc56597ad02ca /pkgs/os-specific/linux/kernel/common-config.nix | |
| parent | 8a73cd873409400ef01530523bf8d11fae82334c (diff) | |
| download | nixpkgs-5953625fa5235f3b947cc4d884b138f0ca4c475b.tar nixpkgs-5953625fa5235f3b947cc4d884b138f0ca4c475b.tar.gz nixpkgs-5953625fa5235f3b947cc4d884b138f0ca4c475b.tar.bz2 nixpkgs-5953625fa5235f3b947cc4d884b138f0ca4c475b.tar.lz nixpkgs-5953625fa5235f3b947cc4d884b138f0ca4c475b.tar.xz nixpkgs-5953625fa5235f3b947cc4d884b138f0ca4c475b.tar.zst nixpkgs-5953625fa5235f3b947cc4d884b138f0ca4c475b.zip | |
linux: 5.7-rc6 -> 5.8-rc1
Diffstat (limited to 'pkgs/os-specific/linux/kernel/common-config.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 1cec678d153..36fb39fd130 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -206,8 +206,8 @@ let B43_PHY_HT = option yes; BCMA_HOST_PCI = option yes; RTW88 = whenAtLeast "5.2" module; - RTW88_8822BE = whenAtLeast "5.2" yes; - RTW88_8822CE = whenAtLeast "5.2" yes; + RTW88_8822BE = mkMerge [ (whenBetween "5.2" "5.8" yes) (whenAtLeast "5.8" module) ]; + RTW88_8822CE = mkMerge [ (whenBetween "5.2" "5.8" yes) (whenAtLeast "5.8" module) ]; }; fb = { |