Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / crypto / Makefile

diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile
index daa0e1560c9bd0cfff2fd57e1b578a46bb870b8b..6549d4503a43730e95d898e5e9202308d71fe686 100644 (file)
--- a/drivers/crypto/Makefile
+++ b/drivers/crypto/Makefile
@@ -2,3 +2,4 @@ obj-$(CONFIG_CRYPTO_DEV_PADLOCK_AES) += padlock-aes.o
 obj-$(CONFIG_CRYPTO_DEV_PADLOCK_SHA) += padlock-sha.o
 obj-$(CONFIG_CRYPTO_DEV_GEODE) += geode-aes.o
 obj-$(CONFIG_OMAP_SHA1_MD5) += omap-sha1-md5.o
+obj-$(CONFIG_CRYPTO_DEV_HIFN_795X) += hifn_795x.o