diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-25 20:35:19 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-25 20:35:19 +0200 |
commit | 679136e25258760f9991cdbb8d26440e666daf78 (patch) | |
tree | 6675bdf0983876aa26417101492a5c54e30efcc3 /pkgs/os-specific/linux/kernel/common-config.nix | |
parent | 7a3be9661438e1e59592fd3fbc7198b88842d1cd (diff) | |
parent | bef20b38efca840135d7f174f5044d098a7deca2 (diff) | |
download | nixlib-679136e25258760f9991cdbb8d26440e666daf78.tar nixlib-679136e25258760f9991cdbb8d26440e666daf78.tar.gz nixlib-679136e25258760f9991cdbb8d26440e666daf78.tar.bz2 nixlib-679136e25258760f9991cdbb8d26440e666daf78.tar.lz nixlib-679136e25258760f9991cdbb8d26440e666daf78.tar.xz nixlib-679136e25258760f9991cdbb8d26440e666daf78.tar.zst nixlib-679136e25258760f9991cdbb8d26440e666daf78.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 1272d19d8ea5..f07368cc80d1 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -255,7 +255,7 @@ let SND_HDA_RECONFIG = yes; # Support reconfiguration of jack functions # Support configuring jack functions via fw mechanism at boot SND_HDA_PATCH_LOADER = yes; - SND_HDA_CODEC_CA0132_DSP = whenOlder "5.8" yes; # Enable DSP firmware loading on Creative Soundblaster Z/Zx/ZxR/Recon + SND_HDA_CODEC_CA0132_DSP = whenOlder "5.7" yes; # Enable DSP firmware loading on Creative Soundblaster Z/Zx/ZxR/Recon SND_OSSEMUL = yes; SND_USB_CAIAQ_INPUT = yes; # Enable PSS mixer (Beethoven ADSP-16 and other compatible) |