diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-07-30 18:01:39 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-30 18:01:39 +0000 |
| commit | 8181d9443bebe56f2dc656cb3348d4167d552065 (patch) | |
| tree | 81d922f26c4f1bc59b3924e2dea0a41c183a95a0 /pkgs/os-specific/linux/kernel/common-config.nix | |
| parent | 836aacc173017966e0981dc87513fd17e5a2a8a6 (diff) | |
| parent | 4168b4005a897ae700d040af7e9352196b2b8d6d (diff) | |
| download | nixpkgs-8181d9443bebe56f2dc656cb3348d4167d552065.tar nixpkgs-8181d9443bebe56f2dc656cb3348d4167d552065.tar.gz nixpkgs-8181d9443bebe56f2dc656cb3348d4167d552065.tar.bz2 nixpkgs-8181d9443bebe56f2dc656cb3348d4167d552065.tar.lz nixpkgs-8181d9443bebe56f2dc656cb3348d4167d552065.tar.xz nixpkgs-8181d9443bebe56f2dc656cb3348d4167d552065.tar.zst nixpkgs-8181d9443bebe56f2dc656cb3348d4167d552065.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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 17ddb9f81ad..efbcdead6f8 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -716,7 +716,7 @@ let MEDIA_PCI_SUPPORT = yes; MEDIA_USB_SUPPORT = yes; MEDIA_ANALOG_TV_SUPPORT = yes; - VIDEO_STK1160_COMMON = module; + VIDEO_STK1160_COMMON = whenOlder "6.5" module; }; "9p" = { |