From 7a2b8a48f6600af0bd8f14f5932f97bc1f3a4555 Mon Sep 17 00:00:00 2001 From: Luka Perkov Date: Fri, 8 Aug 2014 13:38:22 +0000 Subject: kernel: update 3.14 to 3.14.16 Signed-off-by: Luka Perkov git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42070 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/x86_64/Makefile | 2 +- target/linux/x86_64/config-default | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'target/linux/x86_64') diff --git a/target/linux/x86_64/Makefile b/target/linux/x86_64/Makefile index 7e5312631c..d63d4508c9 100644 --- a/target/linux/x86_64/Makefile +++ b/target/linux/x86_64/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=x86_64 FEATURES:=ext4 vdi vmdk targz MAINTAINER:=Imre Kaloz -LINUX_VERSION:=3.14.14 +LINUX_VERSION:=3.14.16 KERNELNAME:=bzImage diff --git a/target/linux/x86_64/config-default b/target/linux/x86_64/config-default index 48145bebd7..f3aabcb5d3 100644 --- a/target/linux/x86_64/config-default +++ b/target/linux/x86_64/config-default @@ -472,6 +472,7 @@ CONFIG_X86_LOCAL_APIC=y CONFIG_X86_MCE=y CONFIG_X86_MCE_AMD=y # CONFIG_X86_MCE_INJECT is not set +# CONFIG_X86_16BIT is not set CONFIG_X86_MCE_INTEL=y CONFIG_X86_MCE_THRESHOLD=y CONFIG_X86_MINIMUM_CPU_FAMILY=64 -- cgit v1.2.3