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 /mk/kernel-ver.mk | |
| parent | ed3d91cf2dfc6f63ae749b54c7d718eb73dd6211 (diff) | |
| parent | 6e58f05aaae4943de494bc30dd3bf184a6d676f2 (diff) | |
resolve conflict
Diffstat (limited to 'mk/kernel-ver.mk')
| -rw-r--r-- | mk/kernel-ver.mk | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index 09362fbae..96fad87b8 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -1,14 +1,14 @@ ifeq ($(ADK_KERNEL_VERSION_TOOLCHAIN),y) -KERNEL_VERSION:= 3.12.13 +KERNEL_VERSION:= 3.13.6 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 KERNEL_MD5SUM:= 345f5883cfb906dac4aef87e303d3a2d endif -ifeq ($(ADK_KERNEL_VERSION_3_13_5),y) -KERNEL_VERSION:= 3.13.5 +ifeq ($(ADK_KERNEL_VERSION_3_13_6),y) +KERNEL_VERSION:= 3.13.6 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= b9fa20262a7ecbbc3277aa2ee10412da +KERNEL_MD5SUM:= 445aa27da818617409982f42902a6e41 endif ifeq ($(ADK_KERNEL_VERSION_3_12_13),y) KERNEL_VERSION:= 3.12.13 @@ -22,6 +22,12 @@ KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 KERNEL_MD5SUM:= 59f352d3f4e2cdf6755f79e09fa09176 endif +ifeq ($(ADK_KERNEL_VERSION_3_10_30),y) +KERNEL_VERSION:= 3.10.30 +KERNEL_MOD_VERSION:= $(KERNEL_VERSION) +KERNEL_RELEASE:= 1 +KERNEL_MD5SUM:= f48ca7dd9f2eb14a2903cb6a4fbe07ed +endif ifeq ($(ADK_KERNEL_VERSION_3_4_82),y) KERNEL_VERSION:= 3.4.82 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) |