summaryrefslogtreecommitdiffstats
path: root/kernel-ppc64p7.config
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2017-05-15 10:20:02 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2017-05-15 10:20:02 -0500
commitac4ad6bdf334a0200bb64532d377fb4fddd5614a (patch)
treeb270644a6486bfd8ca40679e9434c6d558455c07 /kernel-ppc64p7.config
parentfd234dbc0e1170ff58cfac4cf7a1ba07ad53f8e0 (diff)
downloadkernel-ac4ad6bdf334a0200bb64532d377fb4fddd5614a.tar.gz
kernel-ac4ad6bdf334a0200bb64532d377fb4fddd5614a.tar.xz
kernel-ac4ad6bdf334a0200bb64532d377fb4fddd5614a.zip
Linux v4.12-rc1
Diffstat (limited to 'kernel-ppc64p7.config')
-rw-r--r--kernel-ppc64p7.config8
1 files changed, 7 insertions, 1 deletions
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index cf64f5870..12eb430b7 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -2232,6 +2232,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
@@ -3544,7 +3546,7 @@ CONFIG_PCI_ENDPOINT=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_PASID=y
CONFIG_PCIPCWATCHDOG=m
@@ -3641,8 +3643,10 @@ CONFIG_PPC64=y
# CONFIG_PPC_83xx is not set
# CONFIG_PPC_86xx is not set
# CONFIG_PPC_CELL is not set
+CONFIG_PPC_CPUFEATURES_ENABLE_UNKNOWN=y
CONFIG_PPC_DENORMALISATION=y
CONFIG_PPC_DISABLE_WERROR=y
+CONFIG_PPC_DT_CPU_FTRS=y
# CONFIG_PPC_EARLY_DEBUG is not set
CONFIG_PPC_EMULATED_STATS=y
# CONFIG_PPC_EPAPR_HV_BYTECHAN is not set
@@ -4919,6 +4923,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
@@ -5068,6 +5073,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