git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge mainline v2.6.27-rc2 tree into linux-omap tree
[pandora-kernel.git]
/
drivers
/
crypto
/
Makefile
diff --git
a/drivers/crypto/Makefile
b/drivers/crypto/Makefile
index
6549d45
..
5da41a1
100644
(file)
--- a/
drivers/crypto/Makefile
+++ b/
drivers/crypto/Makefile
@@
-3,3
+3,5
@@
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
+obj-$(CONFIG_CRYPTO_DEV_TALITOS) += talitos.o
+obj-$(CONFIG_CRYPTO_DEV_IXP4XX) += ixp4xx_crypto.o