diff options
| author | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
| commit | b2576e1d4408e134e2188c967b1f28af39cd79d4 (patch) | |
| tree | 004f3c82faab760f304ce031d6d2f572e7746a50 /crypto/Makefile | |
| parent | 3cc8a5f4ba91f67bbdb81a43a99281a26aab8d77 (diff) | |
| parent | 2150edc6c5cf00f7adb54538b9ea2a3e9cedca3f (diff) | |
Merge branch 'linus' into release
Diffstat (limited to 'crypto/Makefile')
| -rw-r--r-- | crypto/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/Makefile b/crypto/Makefile index cd4a4ed078ff..46b08bf2035f 100644 --- a/crypto/Makefile +++ b/crypto/Makefile | |||
| @@ -22,6 +22,7 @@ obj-$(CONFIG_CRYPTO_SEQIV) += seqiv.o | |||
| 22 | 22 | ||
| 23 | crypto_hash-objs := hash.o | 23 | crypto_hash-objs := hash.o |
| 24 | crypto_hash-objs += ahash.o | 24 | crypto_hash-objs += ahash.o |
| 25 | crypto_hash-objs += shash.o | ||
| 25 | obj-$(CONFIG_CRYPTO_HASH2) += crypto_hash.o | 26 | obj-$(CONFIG_CRYPTO_HASH2) += crypto_hash.o |
| 26 | 27 | ||
| 27 | cryptomgr-objs := algboss.o testmgr.o | 28 | cryptomgr-objs := algboss.o testmgr.o |