summaryrefslogtreecommitdiff
path: root/crypto/Makefile
diff options
context:
space:
mode:
authorHenrique de Moraes Holschuh <hmh@hmh.eng.br>2010-05-16 19:40:56 -0300
committerHenrique de Moraes Holschuh <hmh@hmh.eng.br>2010-05-16 19:40:56 -0300
commit1c93dc3bd2d1f3f22f021b036c647db1316a7083 (patch)
tree1678134117b42ea7af7d7b4c1f10e864d486ae25 /crypto/Makefile
parent39fa904443d5fef09dfeb90b94ec9892a5a96a35 (diff)
parent30800d10f2872689cd78711f26b065494df8bb74 (diff)
downloadlinux-crypto-1c93dc3bd2d1f3f22f021b036c647db1316a7083.tar.gz
linux-crypto-1c93dc3bd2d1f3f22f021b036c647db1316a7083.zip
Merge mainline (v2.6.34-rc7)
Diffstat (limited to '')
-rw-r--r--crypto/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/Makefile b/crypto/Makefile
index 9e8f6190..d7e6441d 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -56,6 +56,7 @@ obj-$(CONFIG_CRYPTO_XTS) += xts.o
obj-$(CONFIG_CRYPTO_CTR) += ctr.o
obj-$(CONFIG_CRYPTO_GCM) += gcm.o
obj-$(CONFIG_CRYPTO_CCM) += ccm.o
+obj-$(CONFIG_CRYPTO_PCRYPT) += pcrypt.o
obj-$(CONFIG_CRYPTO_CRYPTD) += cryptd.o
obj-$(CONFIG_CRYPTO_DES) += des_generic.o
obj-$(CONFIG_CRYPTO_FCRYPT) += fcrypt.o