diff options
author | Justin M. Forbes <jforbes@redhat.com> | 2016-10-24 16:20:05 -0500 |
---|---|---|
committer | Justin M. Forbes <jforbes@redhat.com> | 2016-10-24 16:20:05 -0500 |
commit | e4b3d2ead04685e1f0f39096a2322c9e4ee56db9 (patch) | |
tree | 27ce1dc7f7a6293c3dc54f6480e2ee6c3b913528 /config-x86-generic | |
parent | 2ade70cc51ecbb35697bede755a4ae1486a59681 (diff) | |
download | kernel-e4b3d2ead04685e1f0f39096a2322c9e4ee56db9.tar.gz kernel-e4b3d2ead04685e1f0f39096a2322c9e4ee56db9.tar.xz kernel-e4b3d2ead04685e1f0f39096a2322c9e4ee56db9.zip |
Linux v4.8.4 rebase
Diffstat (limited to 'config-x86-generic')
-rw-r--r-- | config-x86-generic | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/config-x86-generic b/config-x86-generic index bbbd71da1..a44190bd7 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -76,7 +76,7 @@ CONFIG_X86_MPPARSE=y CONFIG_MMIOTRACE=y # CONFIG_MMIOTRACE_TEST is not set # CONFIG_DEBUG_PER_CPU_MAPS is not set -# CONFIG_DEBUG_WX is not set +CONFIG_DEBUG_WX=y CONFIG_DEBUG_STACKOVERFLOW=y CONFIG_ACPI=y @@ -86,7 +86,6 @@ CONFIG_ACPI_BUTTON=y CONFIG_ACPI_CONTAINER=y CONFIG_ACPI_DOCK=y CONFIG_ACPI_FAN=y -CONFIG_ACPI_NUMA=y CONFIG_ACPI_PROCESSOR=y CONFIG_ACPI_PROCFS=y CONFIG_ACPI_SBS=m @@ -95,6 +94,7 @@ CONFIG_ACPI_THERMAL=y CONFIG_ACPI_TOSHIBA=m CONFIG_ACPI_VIDEO=m CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y +CONFIG_ACPI_CONFIGFS=m # FIXME: Next two are deprecated. Remove them when they disappear upstream # CONFIG_ACPI_PROCFS_POWER is not set CONFIG_PNPACPI=y @@ -105,6 +105,7 @@ CONFIG_ACPI_APEI_PCIEAER=y CONFIG_ACPI_APEI_GHES=y CONFIG_ACPI_APEI_MEMORY_FAILURE=y # CONFIG_ACPI_APEI_EINJ is not set +CONFIG_DPTF_POWER=m CONFIG_ACPI_IPMI=m CONFIG_ACPI_CUSTOM_METHOD=m CONFIG_ACPI_BGRT=y @@ -116,10 +117,11 @@ CONFIG_INTEL_SOC_PMIC=y CONFIG_PMIC_OPREGION=y CONFIG_CRC_PMIC_OPREGION=y CONFIG_XPOWER_PMIC_OPREGION=y +CONFIG_BXT_WC_PMIC_OPREGION=y CONFIG_GPIO_CRYSTAL_COVE=y CONFIG_AXP288_ADC=y CONFIG_AXP288_FUEL_GAUGE=y -# CONFIG_PWM_CRC is not set +CONFIG_PWM_CRC=y CONFIG_X86_INTEL_PSTATE=y @@ -243,6 +245,7 @@ CONFIG_FUJITSU_TABLET=m CONFIG_FUJITSU_LAPTOP=m # CONFIG_FUJITSU_LAPTOP_DEBUG is not set CONFIG_IDEAPAD_LAPTOP=m +CONFIG_INTEL_VBTN=m CONFIG_INTEL_HID_EVENT=m CONFIG_MSI_LAPTOP=m CONFIG_PANASONIC_LAPTOP=m @@ -274,6 +277,7 @@ CONFIG_PVPANIC=m # CONFIG_TOUCHSCREEN_INTEL_MID is not set CONFIG_TOUCHSCREEN_GOODIX=m +CONFIG_TOUCHSCREEN_SURFACE3_SPI=m # CONFIG_SMSC37B787_WDT is not set CONFIG_VIA_WDT=m @@ -341,11 +345,6 @@ CONFIG_SPI_PXA2XX=m CONFIG_MTD_ESB2ROM=m CONFIG_MTD_CK804XROM=m -CONFIG_CPU_IDLE=y -# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set -# CONFIG_CPU_IDLE_GOV_LADDER is not set -CONFIG_CPU_IDLE_GOV_MENU=y - CONFIG_THINKPAD_ACPI=m # CONFIG_THINKPAD_ACPI_DEBUG is not set # CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set @@ -461,7 +460,6 @@ CONFIG_INTEL_PMC_CORE=y CONFIG_VIDEO_VIA_CAMERA=m -CONFIG_IRQ_TIME_ACCOUNTING=y CONFIG_X86_RESERVE_LOW=64 # CONFIG_IRQ_DOMAIN_DEBUG is not set @@ -565,10 +563,12 @@ CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m +CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m CONFIG_SND_SOC_AC97_CODEC=m # CONFIG_SND_SOC_TAS571X is not set # CONFIG_SND_SUN4I_CODEC is not set # CONFIG_SND_SUN4I_SPDIF is not set +# CONFIG_SND_SUN4I_I2S is not set CONFIG_INTEL_POWERCLAMP=m CONFIG_X86_PKG_TEMP_THERMAL=m |