diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-06-10 16:15:47 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-06-10 16:18:40 +0200 |
| commit | 34d58cb8396b5e031abe4ffbb1b30da8549bf79d (patch) | |
| tree | eabd1ac6e61a50ef5ae2efe55ee4592df4d310c4 /pkgs/os-specific/linux/kernel/common-config.nix | |
| parent | bbe71613b6e656e707acdf9c279736c900bf4e87 (diff) | |
| parent | 16024fcaecf63efb99aac191ee04af18762570cf (diff) | |
| download | nixlib-34d58cb8396b5e031abe4ffbb1b30da8549bf79d.tar nixlib-34d58cb8396b5e031abe4ffbb1b30da8549bf79d.tar.gz nixlib-34d58cb8396b5e031abe4ffbb1b30da8549bf79d.tar.bz2 nixlib-34d58cb8396b5e031abe4ffbb1b30da8549bf79d.tar.lz nixlib-34d58cb8396b5e031abe4ffbb1b30da8549bf79d.tar.xz nixlib-34d58cb8396b5e031abe4ffbb1b30da8549bf79d.tar.zst nixlib-34d58cb8396b5e031abe4ffbb1b30da8549bf79d.zip | |
Merge branch 'staging' into staging-next
This commit has already been partially rebuilt in https://hydra.nixos.org/eval/1592635 In particular, the severe security fix for gnutls is contained.
Diffstat (limited to 'pkgs/os-specific/linux/kernel/common-config.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 06ed2cf15598..433c27d4113e 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -727,6 +727,7 @@ let PSI = whenAtLeast "4.20" yes; MODVERSIONS = whenOlder "4.9" yes; + MOUSE_ELAN_I2C_SMBUS = yes; MOUSE_PS2_ELANTECH = yes; # Elantech PS/2 protocol extension MTRR_SANITIZER = yes; NET_FC = yes; # Fibre Channel driver support |