diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-10 16:29:28 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-10 16:29:28 +0100 |
| commit | 39aef29414d77492e06d872cfeaf4ba744fa9d38 (patch) | |
| tree | 708ee5f6f46f5bd2db6c4ec1cce2a1922df4076a /Config.in | |
| parent | ed3d91cf2dfc6f63ae749b54c7d718eb73dd6211 (diff) | |
| parent | 6e58f05aaae4943de494bc30dd3bf184a6d676f2 (diff) | |
resolve conflict
Diffstat (limited to 'Config.in')
| -rw-r--r-- | Config.in | 13 |
1 files changed, 9 insertions, 4 deletions
@@ -97,7 +97,7 @@ prompt "Kernel Version" depends on ADK_TOOLCHAIN_ONLY config ADK_KERNEL_VERSION_TOOLCHAIN - prompt "3.12.13" + prompt "3.13.6" boolean depends on ADK_TOOLCHAIN_ONLY @@ -109,8 +109,8 @@ depends on !ADK_TOOLCHAIN_ONLY && !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_ choice prompt "Kernel Version" -config ADK_KERNEL_VERSION_3_13_5 - prompt "3.13.5" +config ADK_KERNEL_VERSION_3_13_6 + prompt "3.13.6" boolean config ADK_KERNEL_VERSION_3_12_13 @@ -121,6 +121,10 @@ config ADK_KERNEL_VERSION_3_11_10 prompt "3.11.10" boolean +config ADK_KERNEL_VERSION_3_10_30 + prompt "3.10.30" + boolean + config ADK_KERNEL_VERSION_3_4_82 prompt "3.4.82" boolean @@ -129,9 +133,10 @@ endchoice config ADK_KERNEL_VERSION string - default "3.13.5" if ADK_KERNEL_VERSION_3_13_5 + default "3.13.6" if ADK_KERNEL_VERSION_3_13_6 default "3.12.13" if ADK_KERNEL_VERSION_3_12_13 default "3.11.10" if ADK_KERNEL_VERSION_3_11_10 + default "3.10.30" if ADK_KERNEL_VERSION_3_10_30 default "3.4.82" if ADK_KERNEL_VERSION_3_4_82 help |