diff options
| author | Luka Perkov <luka@openwrt.org> | 2014-08-08 13:38:22 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2014-08-08 13:38:22 +0000 |
| commit | 7a2b8a48f6600af0bd8f14f5932f97bc1f3a4555 (patch) | |
| tree | e591d51d709aeecdd91d06bcb00461180e084209 /target/linux/x86_64 | |
| parent | f34aeeedd4dd6ebb07500c67a0bdad6fe88a44b4 (diff) | |
| download | upstream-7a2b8a48f6600af0bd8f14f5932f97bc1f3a4555.tar.gz upstream-7a2b8a48f6600af0bd8f14f5932f97bc1f3a4555.tar.bz2 upstream-7a2b8a48f6600af0bd8f14f5932f97bc1f3a4555.zip | |
kernel: update 3.14 to 3.14.16
Signed-off-by: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42070 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/x86_64')
| -rw-r--r-- | target/linux/x86_64/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/x86_64/config-default | 1 |
2 files changed, 2 insertions, 1 deletions
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 <kaloz@openwrt.org> -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 |