diff options
author | Vladimír Čunát <v@cunat.cz> | 2021-08-18 22:23:15 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2021-08-18 22:23:15 +0200 |
commit | 7c38b03f742a657bf38e9579adeb608fc7cc5f1a (patch) | |
tree | 9d3dd1c822649f7e8f8bb3ad53008dea9c82cc64 /pkgs/os-specific/linux/kernel | |
parent | bbc3fbf67cdd49f91002cff05d4ce31fdd57662b (diff) | |
parent | 57cedea2a2fc44cc765c1c4e0ec057f081b4ca0a (diff) | |
download | nixpkgs-7c38b03f742a657bf38e9579adeb608fc7cc5f1a.tar nixpkgs-7c38b03f742a657bf38e9579adeb608fc7cc5f1a.tar.gz nixpkgs-7c38b03f742a657bf38e9579adeb608fc7cc5f1a.tar.bz2 nixpkgs-7c38b03f742a657bf38e9579adeb608fc7cc5f1a.tar.lz nixpkgs-7c38b03f742a657bf38e9579adeb608fc7cc5f1a.tar.xz nixpkgs-7c38b03f742a657bf38e9579adeb608fc7cc5f1a.tar.zst nixpkgs-7c38b03f742a657bf38e9579adeb608fc7cc5f1a.zip |
Merge #131928: branch 'staging-next'
Diffstat (limited to 'pkgs/os-specific/linux/kernel')
-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 2a23c8d3ea5..c82f872e488 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -790,6 +790,7 @@ let MODVERSIONS = whenOlder "4.9" yes; MOUSE_ELAN_I2C_SMBUS = yes; MOUSE_PS2_ELANTECH = yes; # Elantech PS/2 protocol extension + MOUSE_PS2_VMMOUSE = yes; MTRR_SANITIZER = yes; NET_FC = yes; # Fibre Channel driver support # GPIO on Intel Bay Trail, for some Chromebook internal eMMC disks |