aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2015-02-08 15:31:25 +0000
committerLuka Perkov <luka@openwrt.org>2015-02-08 15:31:25 +0000
commitf6a01dd3d19187443d15ded29c7fa7801273dd10 (patch)
tree9af495de525dc6d011f8e105d6eaab32665d3fb9 /target/linux
parent683da1384bc567d1a29544ca98f56dea4542cb3c (diff)
downloadupstream-f6a01dd3d19187443d15ded29c7fa7801273dd10.tar.gz
upstream-f6a01dd3d19187443d15ded29c7fa7801273dd10.tar.bz2
upstream-f6a01dd3d19187443d15ded29c7fa7801273dd10.zip
x86: refresh kernel config
Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 44321
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/x86/config-3.143
1 files changed, 3 insertions, 0 deletions
diff --git a/target/linux/x86/config-3.14 b/target/linux/x86/config-3.14
index ad638344f5..58bba53be6 100644
--- a/target/linux/x86/config-3.14
+++ b/target/linux/x86/config-3.14
@@ -211,6 +211,7 @@ CONFIG_INPUT_KEYBOARD=y
CONFIG_INSTRUCTION_DECODER=y
# CONFIG_INTEL_POWERCLAMP is not set
# CONFIG_IOMMU_STRESS is not set
+# CONFIG_IOSF_MBI is not set
CONFIG_IO_DELAY_0X80=y
# CONFIG_IO_DELAY_0XED is not set
# CONFIG_IO_DELAY_NONE is not set
@@ -261,6 +262,7 @@ CONFIG_MODULES_USE_ELF_REL=y
CONFIG_MTD_BLOCK2MTD=y
# CONFIG_MTD_CFI is not set
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+CONFIG_MTD_SPLIT_SUPPORT=y
# CONFIG_MTD_TS5500 is not set
CONFIG_MTRR=y
# CONFIG_MTRR_SANITIZER is not set
@@ -417,6 +419,7 @@ CONFIG_X86_RESERVE_LOW=64
CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
CONFIG_X86_THERMAL_VECTOR=y
CONFIG_X86_UP_APIC=y
+CONFIG_X86_UP_APIC_MSI=y
CONFIG_X86_UP_IOAPIC=y
CONFIG_X86_VERBOSE_BOOTUP=y
CONFIG_XZ_DEC_BCJ=y