Pull error-inject into release branch

[linux-2.6] / crypto / Makefile

diff --git a/crypto/Makefile b/crypto/Makefile
index a3e1915ef01a914dfbfd1f44d21e4952e88288ef..12f93f578171daccd1bad404d8d28229bd450321 100644 (file)
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -36,6 +36,7 @@ obj-$(CONFIG_CRYPTO_TWOFISH) += twofish.o
 obj-$(CONFIG_CRYPTO_TWOFISH_COMMON) += twofish_common.o
 obj-$(CONFIG_CRYPTO_SERPENT) += serpent.o
 obj-$(CONFIG_CRYPTO_AES) += aes.o
+obj-$(CONFIG_CRYPTO_CAMELLIA) += camellia.o
 obj-$(CONFIG_CRYPTO_CAST5) += cast5.o
 obj-$(CONFIG_CRYPTO_CAST6) += cast6.o
 obj-$(CONFIG_CRYPTO_ARC4) += arc4.o