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 | dd8d72909634e0ba521519748827cb06f8c3f37d (patch) | |
| tree | f43bc5d2e2fc1a21ea27855f88182ed11c126405 /target/linux/x86_64 | |
| parent | c1d698fce45c485516b2358d78cc976e8515862c (diff) | |
| download | upstream-dd8d72909634e0ba521519748827cb06f8c3f37d.tar.gz upstream-dd8d72909634e0ba521519748827cb06f8c3f37d.tar.bz2 upstream-dd8d72909634e0ba521519748827cb06f8c3f37d.zip | |
kernel: update 3.14 to 3.14.16
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 42070
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 |