diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2015-09-01 09:59:08 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2015-09-01 09:59:08 +0200 |
| commit | cfc70a48027b1b56231df62a30a7da888f33e3ce (patch) | |
| tree | cb2e856d51f1a79822a2b21d8c2cbaea55ae170d /linux | |
| parent | 70874e321dbd50203187c41214cb888507cd6df1 (diff) | |
| parent | aa016797444017d4379a139e39697e38ed2e2357 (diff) | |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/Config.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/Config.in b/linux/Config.in index 806c4950f..86aeeeb64 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -21,7 +21,7 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "4.1.4" + bool "4.1.5" config BR2_LINUX_KERNEL_SAME_AS_HEADERS bool "Same as toolchain kernel headers" @@ -109,7 +109,7 @@ config BR2_LINUX_KERNEL_CUSTOM_LOCAL_PATH config BR2_LINUX_KERNEL_VERSION string - default "4.1.4" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.1.5" if BR2_LINUX_KERNEL_LATEST_VERSION default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION |