diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-02-08 15:25:18 -0800 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-02-08 15:25:18 -0800 |
| commit | 9783e1df7a6bd1e4dc5e2cafcdc29b65a47473d6 (patch) | |
| tree | 9216a285bfe23aa799ca6efa01a3f4063d798e64 /crypto/Makefile | |
| parent | 4387ff75f29412a234d394b0276c2b239d3d3844 (diff) | |
| parent | dc2e2f33bbf07344995357314fd8887f6564dba7 (diff) | |
Merge branch 'HEAD' of master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6
Conflicts:
crypto/Kconfig
Diffstat (limited to 'crypto/Makefile')
| -rw-r--r-- | crypto/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/Makefile b/crypto/Makefile index 60e3d24f61f..12f93f57817 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -27,13 +27,16 @@ obj-$(CONFIG_CRYPTO_TGR192) += tgr192.o obj-$(CONFIG_CRYPTO_GF128MUL) += gf128mul.o obj-$(CONFIG_CRYPTO_ECB) += ecb.o obj-$(CONFIG_CRYPTO_CBC) += cbc.o +obj-$(CONFIG_CRYPTO_PCBC) += pcbc.o obj-$(CONFIG_CRYPTO_LRW) += lrw.o obj-$(CONFIG_CRYPTO_DES) += des.o +obj-$(CONFIG_CRYPTO_FCRYPT) += fcrypt.o obj-$(CONFIG_CRYPTO_BLOWFISH) += blowfish.o 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 |