aboutsummaryrefslogtreecommitdiff
path: root/linux/Config.in
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2018-09-07 13:08:31 +0200
committerGravatar Peter Korsgaard <peter@korsgaard.com>2018-09-07 13:13:17 +0200
commit721e4cbb529d247c9c1ebef68275e70a3086ae0b (patch)
tree2967ef4e10e2592661f664df4515d67dbc80cfe5 /linux/Config.in
parent89920e9735cb561dccf1e1f81d35788fd10a655b (diff)
parentcec266ee1f708f11cc679cb4f81613fa4186003c (diff)
downloadbuildroot-721e4cbb529d247c9c1ebef68275e70a3086ae0b.tar.gz
buildroot-721e4cbb529d247c9c1ebef68275e70a3086ae0b.tar.bz2
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'linux/Config.in')
-rw-r--r--linux/Config.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/Config.in b/linux/Config.in
index 69042af168..0c05e8bdcd 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -30,7 +30,7 @@ choice
prompt "Kernel version"
config BR2_LINUX_KERNEL_LATEST_VERSION
- bool "Latest version (4.17)"
+ bool "Latest version (4.18)"
config BR2_LINUX_KERNEL_LATEST_CIP_VERSION
bool "Latest CIP SLTS version (v4.4.138-cip25)"
@@ -120,7 +120,7 @@ endif
config BR2_LINUX_KERNEL_VERSION
string
- default "4.17.19" if BR2_LINUX_KERNEL_LATEST_VERSION
+ default "4.18.5" if BR2_LINUX_KERNEL_LATEST_VERSION
default "v4.4.138-cip25" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
if BR2_LINUX_KERNEL_CUSTOM_VERSION