linux: fix up bad merge conflict
Fix commit 400eaa3452
("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>
This commit is contained in:
parent
6c5ffa24fa
commit
09c989420d
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user