nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-25 01:50:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

linux: 4.16-rc7 -> 4.17-rc1

Browse Source 
(cherry picked from commit f8665f18fb)

One file has been dropped from the commit:

```
 Conflicts:
	pkgs/os-specific/linux/kernel/linux-testing.nix
```
This commit is contained in:
Tim Steinbach
2018-04-17 20:28:11 -04:00
committed by Samuel Dionne-Riel
parent de7ca40ac3
commit 1069e32c4a
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/os-specific/linux/kernel/common-config.nix
View File

@@ -116,7 +116,6 @@ with stdenv.lib;
# Enable various subsystems.
ACCESSIBILITY y # Accessibility support
AUXDISPLAY y # Auxiliary Display support
DONGLE y # Serial dongle support
HIPPI y
MTD_COMPLEX_MAPPINGS y # needed for many devices
SCSI_LOWLEVEL y # enable lots of SCSI devices
@@ -125,6 +124,9 @@ with stdenv.lib;
SPI y # needed for many devices
SPI_MASTER y
WAN y
${optionalString (versionOlder version "4.17") ''
DONGLE y # Serial dongle support
''}
# Networking options.
NET y
@@ -421,7 +423,9 @@ with stdenv.lib;
${optionalString (versionAtLeast version "4.3") ''
IDLE_PAGE_TRACKING y
''}
IRDA_ULTRA y # Ultra (connectionless) protocol
${optionalString (versionOlder version "4.17") ''
IRDA_ULTRA y # Ultra (connectionless) protocol
''}
JOYSTICK_IFORCE_232? y # I-Force Serial joysticks and wheels
JOYSTICK_IFORCE_USB? y # I-Force USB joysticks and wheels
JOYSTICK_XPAD_FF? y # X-Box gamepad rumble support