From: Florian Fainelli <florian@openwrt.org>
Date: Wed, 24 Oct 2012 13:04:54 +0000 (+0000)
Subject: kernel: the camellia module name has changed in kernel 3.4
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f8af095002b743be0b70440f7db4a09a3e89760f;p=openwrt%2Fstaging%2Fjow.git

kernel: the camellia module name has changed in kernel 3.4

With the support for architecture optimized camellia routines, the original
camellia module got renamed to camellia_generic, account for that.

SVN-Revision: 33903
---

diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk
index 984ccc1f9b..43a7cc3431 100644
--- a/package/kernel/modules/crypto.mk
+++ b/package/kernel/modules/crypto.mk
@@ -324,6 +324,9 @@ endef
 
 $(eval $(call KernelPackage,crypto-sha1))
 
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.6.0)),1)
+camellia_mod_suffix=_generic
+endif
 
 define KernelPackage/crypto-misc
   TITLE:=Other CryptoAPI modules
@@ -347,7 +350,7 @@ define KernelPackage/crypto-misc
 	CONFIG_CRYPTO_WP512
   FILES:= \
 	$(LINUX_DIR)/crypto/anubis.ko \
-	$(LINUX_DIR)/crypto/camellia.ko \
+	$(LINUX_DIR)/crypto/camellia$(camellia_mod_suffix).ko \
 	$(LINUX_DIR)/crypto/cast5.ko \
 	$(LINUX_DIR)/crypto/cast6.ko \
 	$(LINUX_DIR)/crypto/fcrypt.ko \