From ac4ad6bdf334a0200bb64532d377fb4fddd5614a Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 15 May 2017 10:20:02 -0500 Subject: Linux v4.12-rc1 --- kernel-ppc64.config | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'kernel-ppc64.config') diff --git a/kernel-ppc64.config b/kernel-ppc64.config index 6f7361222..40d628a79 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -2287,6 +2287,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 @@ -3602,7 +3604,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 @@ -3702,8 +3704,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 @@ -4991,6 +4995,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 @@ -5140,6 +5145,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 -- cgit