diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-05-15 19:03:10 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-05-15 19:03:10 +0200 |
commit | 34935e45f6bb229743089c3f5ac15621829c844a (patch) | |
tree | f661574a8617c0e23631cca49a012810d466255b /kernel-i686-PAE.config | |
parent | d6fd520355f1d3a9fd806285190654fb4aed84b6 (diff) | |
parent | ac4ad6bdf334a0200bb64532d377fb4fddd5614a (diff) | |
download | kernel-34935e45f6bb229743089c3f5ac15621829c844a.tar.gz kernel-34935e45f6bb229743089c3f5ac15621829c844a.tar.xz kernel-34935e45f6bb229743089c3f5ac15621829c844a.zip |
Merge remote-tracking branch 'origin/master'kernel-4.12.0-0.rc1.git0.1.vanilla.knurd.1.fc27kernel-4.12.0-0.rc1.git0.1.vanilla.knurd.1.fc26kernel-4.12.0-0.rc1.git0.1.vanilla.knurd.1.fc25kernel-4.12.0-0.rc1.git0.1.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel-i686-PAE.config')
-rw-r--r-- | kernel-i686-PAE.config | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index 9a7e6be61..457381a53 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -1118,6 +1118,7 @@ CONFIG_DRM_I2C_SIL164=m # CONFIG_DRM_I915_ALPHA_SUPPORT is not set CONFIG_DRM_I915_CAPTURE_ERROR=y CONFIG_DRM_I915_COMPRESS_ERROR=y +# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set CONFIG_DRM_I915_GVT_KVMGT=m CONFIG_DRM_I915_GVT=y CONFIG_DRM_I915=m @@ -2430,6 +2431,8 @@ CONFIG_JOYSTICK_IFORCE_USB=y CONFIG_JOYSTICK_INTERACT=m CONFIG_JOYSTICK_JOYDUMP=m CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_PSXPAD_SPI_FF=y +CONFIG_JOYSTICK_PSXPAD_SPI=m CONFIG_JOYSTICK_SIDEWINDER=m CONFIG_JOYSTICK_SPACEBALL=m CONFIG_JOYSTICK_SPACEORB=m @@ -3796,6 +3799,7 @@ CONFIG_PCI_HERMES=m CONFIG_PCI_HYPERV=m CONFIG_PCI_IOV=y CONFIG_PCI_MMCONFIG=y +CONFIG_PCI_MSI_IRQ_DOMAIN=y CONFIG_PCI_MSI=y CONFIG_PCI_PASID=y CONFIG_PCIPCWATCHDOG=m @@ -5192,6 +5196,7 @@ CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_UUID is not set # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 # CONFIG_THERMAL_EMULATION is not set CONFIG_THERMAL_GOV_BANG_BANG=y CONFIG_THERMAL_GOV_FAIR_SHARE=y @@ -5352,6 +5357,7 @@ CONFIG_UBIFS_ATIME_SUPPORT=y # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set CONFIG_UBIFS_FS_ENCRYPTION=y CONFIG_UBIFS_FS=m +CONFIG_UBIFS_FS_SECURITY=y # CONFIG_UBSAN_ALIGNMENT is not set # CONFIG_UBSAN is not set # CONFIG_UBSAN_SANITIZE_ALL is not set |