diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-08-27 09:40:53 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-08-27 09:44:36 +0200 |
| commit | 5d08c95e8a0101f156cf1afe8b2fae8487d1cfce (patch) | |
| tree | 2510e52b0992afb90b3a9a86ce07b8a2fd26f6f4 /crypto/userspace/Makefile | |
| parent | d5d46ca491d8974ac1eaf7bad3d69e468e49dc34 (diff) | |
| parent | 9cab3a1a9660ed5f798b063aa7e827eb0c95ba94 (diff) | |
| download | kernel-crypto-5d08c95e8a0101f156cf1afe8b2fae8487d1cfce.tar.gz kernel-crypto-5d08c95e8a0101f156cf1afe8b2fae8487d1cfce.tar.xz kernel-crypto-5d08c95e8a0101f156cf1afe8b2fae8487d1cfce.zip | |
Merge branch 'standalone-rename' into userspace-crypto
Conflicts:
.gitignore
crypto/userspace/Makefile
crypto/userspace/cryptodev_int.h
crypto/userspace/ncr-key-wrap.c
crypto/userspace/ncr-key.c
crypto/userspace/ncr-pk.c
crypto/userspace/ncr-sessions.c
crypto/userspace/ncr.c
include/linux/cryptodev.h
Diffstat (limited to 'crypto/userspace/Makefile')
| -rw-r--r-- | crypto/userspace/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/userspace/Makefile b/crypto/userspace/Makefile index 65edf8fb2ce..689ee0d25b6 100644 --- a/crypto/userspace/Makefile +++ b/crypto/userspace/Makefile @@ -65,7 +65,7 @@ TOMCRYPT_OBJECTS = libtomcrypt/misc/zeromem.o libtomcrypt/misc/crypt/crypt_argch cryptodev-objs := cryptodev_main.o cryptodev_cipher.o ncr.o \ ncr-key.o ncr-limits.o ncr-pk.o ncr-sessions.o ncr-dh.o \ - ncr-key-wrap.o ncr-key-storage.o $(TOMMATH_OBJECTS) \ + ncr-key-wrap.o ncr-key-storage.o utils.o $(TOMMATH_OBJECTS) \ $(TOMCRYPT_OBJECTS) |