aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/x86_64
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2014-06-11 23:39:54 +0000
committerLuka Perkov <luka@openwrt.org>2014-06-11 23:39:54 +0000
commita6e15f806007d56125f6309a874137d0389afa00 (patch)
tree2f644a92979c5e91a2286f5d34025473853a1546 /target/linux/x86_64
parentf64c27686bf84e7d480ea516c78c241b2e5dd985 (diff)
downloadmaster-187ad058-a6e15f806007d56125f6309a874137d0389afa00.tar.gz
master-187ad058-a6e15f806007d56125f6309a874137d0389afa00.tar.bz2
master-187ad058-a6e15f806007d56125f6309a874137d0389afa00.zip
kernel: update 3.14 to 3.14.7
Signed-off-by: Luka Perkov <luka@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41150 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/x86_64')
-rw-r--r--target/linux/x86_64/Makefile2
-rw-r--r--target/linux/x86_64/config-default1
2 files changed, 2 insertions, 1 deletions
diff --git a/target/linux/x86_64/Makefile b/target/linux/x86_64/Makefile
index 22e3cbaf3f..3269f45b8e 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.5
+LINUX_VERSION:=3.14.7
KERNELNAME:=bzImage
diff --git a/target/linux/x86_64/config-default b/target/linux/x86_64/config-default
index 3fcca9d78c..48145bebd7 100644
--- a/target/linux/x86_64/config-default
+++ b/target/linux/x86_64/config-default
@@ -16,6 +16,7 @@ CONFIG_ACPI_FAN=y
CONFIG_ACPI_PROCESSOR=y
# CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set
# CONFIG_ACPI_PROCFS is not set
+# CONFIG_ACPI_PROCFS_POWER is not set
# CONFIG_ACPI_SBS is not set
CONFIG_ACPI_THERMAL=y
# CONFIG_ACPI_WMI is not set