diff options
| author | Brian Wood <brian.j.wood@intel.com> | 2015-09-23 15:39:36 -0700 |
|---|---|---|
| committer | Brian Wood <brian.j.wood@intel.com> | 2015-09-23 15:39:36 -0700 |
| commit | c4b02e55558e7dc74b20cb76f6a93a0a6f60e433 (patch) | |
| tree | 982fca5efc576dd3c41e60ca0ef5d8fb7c5748ab | |
| parent | adf5722c0141e429b4a1c66885a187edfb1173f0 (diff) | |
| download | intel-c4b02e55558e7dc74b20cb76f6a93a0a6f60e433.tar.gz | |
Update Edison Brillo defconfig for 3.10.89 merge
This commit updates the Edison Brillo defconfig for
the merged update to kernel version 3.10.89.
Change-Id: I986226b640f1b44732a78f57f38cc20cf5f031c1
Signed-off-by: Brian Wood <brian.j.wood@intel.com>
| -rw-r--r-- | arch/x86/configs/i386_brillo_edison_defconfig | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/x86/configs/i386_brillo_edison_defconfig b/arch/x86/configs/i386_brillo_edison_defconfig index 1683c306ba6..b230f28eef5 100644 --- a/arch/x86/configs/i386_brillo_edison_defconfig +++ b/arch/x86/configs/i386_brillo_edison_defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.10.17 Kernel Configuration +# Linux/i386 3.10.89 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -310,6 +310,7 @@ CONFIG_DEFAULT_CFQ=y CONFIG_DEFAULT_IOSCHED="cfq" CONFIG_ASN1=y CONFIG_UNINLINE_SPIN_UNLOCK=y +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y CONFIG_FREEZER=y # @@ -401,6 +402,8 @@ CONFIG_X86_MCE_THRESHOLD=y # CONFIG_X86_MCE_INJECT is not set CONFIG_X86_THERMAL_VECTOR=y CONFIG_VM86=y +CONFIG_X86_16BIT=y +CONFIG_X86_ESPFIX32=y # CONFIG_TOSHIBA is not set # CONFIG_I8K is not set CONFIG_X86_REBOOTFIXUPS=y @@ -1822,6 +1825,7 @@ CONFIG_INTEL_MCU=y # CONFIG_SENSORS_MAX6697 is not set # CONFIG_SENSORS_MCP3021 is not set # CONFIG_SENSORS_NCT6775 is not set +# CONFIG_SENSORS_NTC_THERMISTOR is not set # CONFIG_SENSORS_PC87360 is not set # CONFIG_SENSORS_PC87427 is not set # CONFIG_SENSORS_PCF8591 is not set @@ -2960,7 +2964,6 @@ CONFIG_DMA_ENGINE=y # # DMA Clients # -# CONFIG_NET_DMA is not set # CONFIG_ASYNC_TX_DMA is not set # CONFIG_DMATEST is not set # CONFIG_AUXDISPLAY is not set @@ -3127,8 +3130,8 @@ CONFIG_SW_SYNC=y CONFIG_SW_SYNC_USER=y # CONFIG_ION is not set # CONFIG_FIQ_WATCHDOG is not set -CONFIG_INTEL_REBOOT_TARGET=y CONFIG_INTEL_SCU_REBOOT_REASON=y +CONFIG_INTEL_REBOOT_TARGET=y # CONFIG_USB_WPAN_HCD is not set # CONFIG_WIMAX_GDM72XX is not set # CONFIG_CSR_WIFI is not set |