diff options
| author | Justin M. Forbes <jforbes@fedoraproject.org> | 2017-05-15 10:20:02 -0500 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2017-05-15 10:20:02 -0500 |
| commit | ac4ad6bdf334a0200bb64532d377fb4fddd5614a (patch) | |
| tree | b270644a6486bfd8ca40679e9434c6d558455c07 /kernel-s390x.config | |
| parent | fd234dbc0e1170ff58cfac4cf7a1ba07ad53f8e0 (diff) | |
| download | kernel-ac4ad6bdf334a0200bb64532d377fb4fddd5614a.tar.gz kernel-ac4ad6bdf334a0200bb64532d377fb4fddd5614a.tar.xz kernel-ac4ad6bdf334a0200bb64532d377fb4fddd5614a.zip | |
Linux v4.12-rc1
Diffstat (limited to 'kernel-s390x.config')
| -rw-r--r-- | kernel-s390x.config | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/kernel-s390x.config b/kernel-s390x.config index 05c2aa095..cc3416241 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -2179,6 +2179,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 @@ -3470,7 +3472,7 @@ CONFIG_PCIEPORTBUS=y CONFIG_PCIE_PTM=y CONFIG_PCI_HERMES=m CONFIG_PCI_IOV=y -CONFIG_PCI_MSI_IRQ_DOMAIN=y +# CONFIG_PCI_MSI_IRQ_DOMAIN is not set CONFIG_PCI_MSI=y CONFIG_PCI_NR_FUNCTIONS=64 CONFIG_PCI_PASID=y @@ -4812,6 +4814,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 is not set CONFIG_THERMAL_GOV_FAIR_SHARE=y @@ -4966,6 +4969,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 |