diff options
| author | Adam Williamson <awilliam@redhat.com> | 2014-11-08 14:59:30 -0800 |
|---|---|---|
| committer | Adam Williamson <awilliam@redhat.com> | 2014-11-08 14:59:30 -0800 |
| commit | 89b19396f6c5dd09eaf8f44bcee27d42a2da1502 (patch) | |
| tree | 317c2721f3a641d3a9308c512532bfb384a4df06 /config-x86-generic | |
| parent | c2e2a0849b034d919e0c2e27c36d77697579eb6b (diff) | |
| parent | b1223bfd6a6dd0bec9b3c0df7b286b22bcc35257 (diff) | |
| download | kernel-89b19396f6c5dd09eaf8f44bcee27d42a2da1502.tar.gz kernel-89b19396f6c5dd09eaf8f44bcee27d42a2da1502.tar.xz kernel-89b19396f6c5dd09eaf8f44bcee27d42a2da1502.zip | |
Merge branch 'master' into baytrail (3.18 bump)
Diffstat (limited to 'config-x86-generic')
| -rw-r--r-- | config-x86-generic | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/config-x86-generic b/config-x86-generic index 75f30faf0..917b20d34 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -52,7 +52,6 @@ CONFIG_EFI_RUNTIME_MAP=y # CONFIG_FB_N411 is not set CONFIG_INTEL_IOMMU=y -CONFIG_DMAR_BROKEN_GFX_WA=y CONFIG_INTEL_IOMMU_FLOPPY_WA=y # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set CONFIG_SCSI_ADVANSYS=m @@ -71,7 +70,6 @@ CONFIG_DEBUG_STACKOVERFLOW=y CONFIG_ACPI=y CONFIG_ACPI_AC=y -# CONFIG_ACPI_ASUS is not set CONFIG_ACPI_BATTERY=y CONFIG_ACPI_BUTTON=y CONFIG_ACPI_CONTAINER=y @@ -88,7 +86,6 @@ CONFIG_ACPI_VIDEO=m CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y # FIXME: Next two are deprecated. Remove them when they disappear upstream # CONFIG_ACPI_PROCFS_POWER is not set -# CONFIG_ACPI_PROC_EVENT is not set CONFIG_PNPACPI=y CONFIG_ACPI_PROCESSOR_AGGREGATOR=m CONFIG_ACPI_HED=m @@ -322,9 +319,9 @@ CONFIG_INTEL_SMARTCONNECT=y CONFIG_PVPANIC=m # CONFIG_TOUCHSCREEN_INTEL_MID is not set +CONFIG_TOUCHSCREEN_GOODIX=m # CONFIG_SMSC37B787_WDT is not set -CONFIG_W83697HF_WDT=m CONFIG_VIA_WDT=m CONFIG_IE6XX_WDT=m @@ -348,7 +345,6 @@ CONFIG_PARAVIRT_TIME_ACCOUNTING=y # PARAVIRT_SPINLOCKS has a 5% perf hit on native hw (see kconfig) # CONFIG_PARAVIRT_SPINLOCKS is not set -CONFIG_KVM_CLOCK=y CONFIG_KVM_GUEST=y CONFIG_KVM_MMU_AUDIT=y # default $x would be nice... # CONFIG_KVM_DEBUG_FS is not set @@ -372,12 +368,13 @@ CONFIG_XEN_COMPAT_XENFS=y CONFIG_XEN_BACKEND=y CONFIG_XEN_BLKDEV_BACKEND=m CONFIG_XEN_DEBUG_FS=y -CONFIG_XEN_PLATFORM_PCI=y CONFIG_XEN_GNTDEV=m CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m CONFIG_XEN_SELFBALLOONING=y CONFIG_XEN_PCIDEV_BACKEND=m CONFIG_XEN_ACPI_PROCESSOR=m +# CONFIG_XEN_SCSI_FRONTEND is not set +# CONFIG_XEN_SCSI_BACKEND is not set CONFIG_MTD_ESB2ROM=m CONFIG_MTD_CK804XROM=m @@ -420,7 +417,7 @@ CONFIG_SP5100_TCO=m # CONFIG_MEMTEST is not set # CONFIG_DEBUG_TLBFLUSH is not set -# CONFIG_MAXSMP is not set +CONFIG_MAXSMP=y CONFIG_HP_ILO=m @@ -461,7 +458,6 @@ CONFIG_LPC_ICH=m CONFIG_GPIO_ICH=m # CONFIG_GPIO_LYNXPOINT is not set -# CONFIG_GPIO_MCP23S08 is not set # CONFIG_GPIO_F7188X is not set # These should all go away with IC2_ACPI is fixed @@ -491,12 +487,10 @@ CONFIG_GPIO_ICH=m # CONFIG_TWL4030_CORE is not set # CONFIG_TWL6040_CORE is not set - CONFIG_PCI_CNB20LE_QUIRK=y CONFIG_ACPI_EC_DEBUGFS=m # CONFIG_ACPI_APEI_ERST_DEBUG is not set -# CONFIG_ACPI_QUICKSTART is not set CONFIG_INTEL_IDLE=y @@ -566,7 +560,11 @@ CONFIG_NFC_MICROREAD_MEI=m # CONFIG_X86_GOLDFISH is not set CONFIG_X86_INTEL_LPSS=y +CONFIG_IOSF_MBI=m +# CONFIG_IOSF_MBI_DEBUG is not set CONFIG_PWM_LPSS=m +CONFIG_PWM_LPSS_PCI=m +CONFIG_PWM_LPSS_PLATFORM=m CONFIG_PINCTRL=y CONFIG_PINCTRL_BAYTRAIL=y @@ -574,6 +572,7 @@ CONFIG_PINCTRL_BAYTRAIL=y CONFIG_X86_PKG_TEMP_THERMAL=m CONFIG_ACPI_INT3403_THERMAL=m CONFIG_INTEL_SOC_DTS_THERMAL=m +CONFIG_INT340X_THERMAL=m CONFIG_VMWARE_VMCI=m CONFIG_VMWARE_VMCI_VSOCKETS=m |