public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master.upstream' into staging.upstream

Browse Source
This commit is contained in:
William A. Kennington III
2015-11-13 15:54:10 -08:00
parent 0ba740d26b 9579c9ec7f
commit 8f45d18a71
126 changed files with 3055 additions and 1624 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/kernel/common-config.nix
+6
View File
@@ -41,6 +41,9 @@ with stdenv.lib;
PM_RUNTIME y
''}
PM_ADVANCED_DEBUG y
${optionalString (versionAtLeast version "3.11") ''
X86_INTEL_LPSS y
''}
${optionalString (versionAtLeast version "3.10") ''
X86_INTEL_PSTATE y
''}
@@ -316,6 +319,9 @@ with stdenv.lib;
MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension
MTRR_SANITIZER y
NET_FC y # Fibre Channel driver support
${optionalString (versionAtLeast version "3.11") ''
PINCTRL_BAYTRAIL y # GPIO on Intel Bay Trail, for some Chromebook internal eMMC disks
''}
PPP_MULTILINK y # PPP multilink support
PPP_FILTER y
REGULATOR y # Voltage and Current Regulator Support