diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-16 18:17:05 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-16 18:17:05 +0200 |
| commit | 52de5f2430557accef08cfd6cd8c18c158c50392 (patch) | |
| tree | cb13e74ef00072613c7c1eb76ad3d4d57a944426 /pkgs/os-specific/linux/kernel/common-config.nix | |
| parent | 385cfde32f080466652955af127f46c701fa6bd7 (diff) | |
| parent | 5d6f47c2234c47fa32c04023f7b393ce5b0b6eec (diff) | |
| download | nixpkgs-52de5f2430557accef08cfd6cd8c18c158c50392.tar nixpkgs-52de5f2430557accef08cfd6cd8c18c158c50392.tar.gz nixpkgs-52de5f2430557accef08cfd6cd8c18c158c50392.tar.bz2 nixpkgs-52de5f2430557accef08cfd6cd8c18c158c50392.tar.lz nixpkgs-52de5f2430557accef08cfd6cd8c18c158c50392.tar.xz nixpkgs-52de5f2430557accef08cfd6cd8c18c158c50392.tar.zst nixpkgs-52de5f2430557accef08cfd6cd8c18c158c50392.zip | |
Merge staging-next into staging
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 03477a7f887..e92a1b5cae6 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 = { |