diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-02-20 22:02:52 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-02-20 22:02:52 +0100 |
| commit | 09c989420db1599c7650ae614c672ea5e699d641 (patch) | |
| tree | 8182d9811f6a83348a1a4b033d183aef916e3352 /linux | |
| parent | 6c5ffa24fa981d3cc01c33dc1db20d24048fdbda (diff) | |
| download | buildroot-09c989420db1599c7650ae614c672ea5e699d641.tar.gz buildroot-09c989420db1599c7650ae614c672ea5e699d641.zip | |
linux: fix up bad merge conflict
Fix commit 400eaa3452e9380ec77ac62266530055506ea6e7 ("linux: bump
default to version 4.10") in which a conflict was not correctly
resolved.
Reported-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/Config.in | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/linux/Config.in b/linux/Config.in index 7f18219009..890b8483e1 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -97,11 +97,7 @@ endif config BR2_LINUX_KERNEL_VERSION string -<<<<<<< a1e02440f3035cfbe5119c00457b3e1c2f7ac4d1 - default "4.9.9" if BR2_LINUX_KERNEL_LATEST_VERSION -======= default "4.10" if BR2_LINUX_KERNEL_LATEST_VERSION ->>>>>>> linux: bump default to version 4.10 default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL |
