diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2016-11-28 06:42:47 +0000 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2016-11-28 06:42:47 +0000 |
| commit | 89ece1e8cb5d2c009a5adfe181e0beac13f5c3b4 (patch) | |
| tree | d4dc1e1bc522d578faac63504fabed319e842197 /config-x86-generic | |
| parent | 38c76ac35533ae3c8ffd98c03843a278d8a464f4 (diff) | |
| download | kernel-89ece1e8cb5d2c009a5adfe181e0beac13f5c3b4.tar.gz kernel-89ece1e8cb5d2c009a5adfe181e0beac13f5c3b4.tar.xz kernel-89ece1e8cb5d2c009a5adfe181e0beac13f5c3b4.zip | |
Minor ARM config updates, Enable two 802.15.4 drivers, General config cleanups (NFC: move some x86 specific configs to x86, EDAC generic to generic, some minor seonsor cleanups)
Diffstat (limited to 'config-x86-generic')
| -rw-r--r-- | config-x86-generic | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/config-x86-generic b/config-x86-generic index d4fbe5957..06b844710 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -159,6 +159,7 @@ CONFIG_INTEL_BXT_PMIC_THERMAL=m CONFIG_HOTPLUG_PCI_COMPAQ=m # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set CONFIG_HOTPLUG_PCI_IBM=m +CONFIG_IBM_ASM=m CONFIG_IPW2100=m CONFIG_IPW2100_MONITOR=y @@ -193,10 +194,7 @@ CONFIG_I2C_DESIGNWARE_BAYTRAIL=y # CONFIG_DELL_RBU is not set CONFIG_DCDBAS=m -CONFIG_EDAC=y -CONFIG_EDAC_MM_EDAC=m -# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set -CONFIG_EDAC_AMD64=m +# CONFIG_EDAC_AMD64 is not set CONFIG_EDAC_AMD76X=m CONFIG_EDAC_AMD8111=m CONFIG_EDAC_AMD8131=m @@ -215,7 +213,6 @@ CONFIG_EDAC_I7CORE=m CONFIG_EDAC_R82600=m CONFIG_EDAC_X38=m CONFIG_EDAC_DECODE_MCE=m -CONFIG_EDAC_LEGACY_SYSFS=y CONFIG_EDAC_IE31200=m CONFIG_SCHED_MC=y @@ -381,11 +378,21 @@ CONFIG_ISCSI_IBFT=m CONFIG_INTEL_IOATDMA=m CONFIG_INTEL_IDMA64=m -CONFIG_SENSORS_I5K_AMB=m -CONFIG_SENSORS_FAM15H_POWER=m +CONFIG_SENSORS_ABITUGURU=m +CONFIG_SENSORS_ABITUGURU3=m CONFIG_SENSORS_ACPI_POWER=m -CONFIG_SENSORS_I5500=m +CONFIG_SENSORS_APPLESMC=m +CONFIG_SENSORS_ASB100=m +CONFIG_SENSORS_ATK0110=m +CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_DELL_SMM=m +CONFIG_SENSORS_FAM15H_POWER=m +CONFIG_SENSORS_FSCHMD=m +CONFIG_SENSORS_I5K_AMB=m +CONFIG_SENSORS_I5500=m +CONFIG_SENSORS_K8TEMP=m +CONFIG_SENSORS_K10TEMP=m +CONFIG_SENSORS_VIA_CPUTEMP=m # CONFIG_CPA_DEBUG is not set |