diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-21 17:22:31 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-21 17:22:31 +0200 |
| commit | 32a82e38679501da738199135b35f93ddc8aca0a (patch) | |
| tree | ed280e079a8bab790b3dba5f62f1d300ada7540b /mk | |
| parent | 90d5c8b73e8d538e121275b12e714332ca785cff (diff) | |
| parent | 86c05906d3e804b41b9280c226a3a07f6fad5f27 (diff) | |
resolve conflicts
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/kernel-ver.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index 957465ee3..d4587aa7d 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -16,9 +16,9 @@ KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 KERNEL_MD5SUM:= edbf88eb7f7d34dbd5d3887726790755 endif -ifeq ($(ADK_KERNEL_VERSION_3_4_60),y) -KERNEL_VERSION:= 3.4.60 +ifeq ($(ADK_KERNEL_VERSION_3_4_65),y) +KERNEL_VERSION:= 3.4.65 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 6173c731d43939c133d0c575e6e0735e +KERNEL_MD5SUM:= c1d4cbf921a74e0234006d6cd9a3ac2b endif |