diff options
| author | James Morris <jmorris@namei.org> | 2012-01-09 02:16:48 +0100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2012-01-09 02:16:48 +0100 |
| commit | 8fcc99549522fc7a0bbaeb5755855ab0d9a59ce8 (patch) | |
| tree | a118eaef15d4ba22247f45ee01537ecc906cd161 /lib/Makefile | |
| parent | Linux 3.2 (diff) | |
| parent | ima: fix invalid memory reference (diff) | |
| download | linux-8fcc99549522fc7a0bbaeb5755855ab0d9a59ce8.tar.xz linux-8fcc99549522fc7a0bbaeb5755855ab0d9a59ce8.zip | |
Merge branch 'next' into for-linus
Conflicts:
security/integrity/evm/evm_crypto.c
Resolved upstream fix vs. next conflict manually.
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'lib/Makefile')
| -rw-r--r-- | lib/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/Makefile b/lib/Makefile index a4da283f5dc0..0f5cff267aff 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -115,6 +115,9 @@ obj-$(CONFIG_CPU_RMAP) += cpu_rmap.o obj-$(CONFIG_CORDIC) += cordic.o +obj-$(CONFIG_MPILIB) += mpi/ +obj-$(CONFIG_DIGSIG) += digsig.o + hostprogs-y := gen_crc32table clean-files := crc32table.h |