diff options
| author | James Morris <jmorris@namei.org> | 2012-01-08 20:16:48 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2012-01-08 20:16:48 -0500 |
| commit | 8fcc99549522fc7a0bbaeb5755855ab0d9a59ce8 (patch) | |
| tree | a118eaef15d4ba22247f45ee01537ecc906cd161 /lib/Makefile | |
| parent | 805a6af8dba5dfdd35ec35dc52ec0122400b2610 (diff) | |
| parent | 7b7e5916aa2f46e57f8bd8cb89c34620ebfda5da (diff) | |
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 | |||
| 115 | 115 | ||
| 116 | obj-$(CONFIG_CORDIC) += cordic.o | 116 | obj-$(CONFIG_CORDIC) += cordic.o |
| 117 | 117 | ||
| 118 | obj-$(CONFIG_MPILIB) += mpi/ | ||
| 119 | obj-$(CONFIG_DIGSIG) += digsig.o | ||
| 120 | |||
| 118 | hostprogs-y := gen_crc32table | 121 | hostprogs-y := gen_crc32table |
| 119 | clean-files := crc32table.h | 122 | clean-files := crc32table.h |
| 120 | 123 | ||