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 | 9125f73ebd37be6e3a601e7e0e056c52a8bf1084 (patch) | |
| tree | 6e4a815735bf71af67cf708abd330940f0da069a /crypto/Makefile | |
| parent | 9cea7c26c02c80c09012acd2740b1ff32d2ea394 (diff) | |
| parent | 440da4461b8600647575a74917f1efb3f08e0af7 (diff) | |
| download | linux-crypto-9125f73ebd37be6e3a601e7e0e056c52a8bf1084.tar.gz linux-crypto-9125f73ebd37be6e3a601e7e0e056c52a8bf1084.zip | |
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 60e3d24f..12f93f57 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 |