Merge branches 'x86-cpu-for-linus', 'x86-boot-for-linus', 'x86-cpufeature-for-linus...

[mv-sheeva.git] / crypto / Makefile

diff --git a/crypto/Makefile b/crypto/Makefile
index 43559438ca515c511dc57b4e3662f5c56a89cac1..30f33d675330e4adfe680a343e98448a82a6171d 100644 (file)
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -67,7 +67,6 @@ obj-$(CONFIG_CRYPTO_TWOFISH) += twofish_generic.o
 obj-$(CONFIG_CRYPTO_TWOFISH_COMMON) += twofish_common.o
 obj-$(CONFIG_CRYPTO_SERPENT) += serpent_generic.o
 obj-$(CONFIG_CRYPTO_AES) += aes_generic.o
-camellia_generic-y = camellia.o
 obj-$(CONFIG_CRYPTO_CAMELLIA) += camellia_generic.o
 obj-$(CONFIG_CRYPTO_CAST5) += cast5.o
 obj-$(CONFIG_CRYPTO_CAST6) += cast6.o