aboutsummaryrefslogtreecommitdiffstats
path: root/lib/Makefile
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2017-01-04 11:41:10 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2017-01-04 11:41:10 +0100
commitef426c103892eed94a9bb0ee59c2d0e6eac5179f (patch)
tree2d998f23fa6e3b3c51f4829f1f881b42e79b7c04 /lib/Makefile
parentMerge tag 'v4.10-rc2' into drm-intel-next-queued (diff)
parentdrm: Add kerneldoc markup for new @scan parameters in drm_mm (diff)
downloadlinux-dev-ef426c103892eed94a9bb0ee59c2d0e6eac5179f.tar.xz
linux-dev-ef426c103892eed94a9bb0ee59c2d0e6eac5179f.zip
Merge tag 'drm-misc-next-2016-12-30' of git://anongit.freedesktop.org/git/drm-misc into drm-intel-next-queued
Directly merge drm-misc into drm-intel since Dave is on vacation and we need the various drm-misc patches (fb format rework, drm mm fixes, selftest framework and others). Also pulled back -rc2 in first to resync with drm-intel-fixes and make sure I can reuse the exact rerere solutions from drm-tip for safety, and because I'm lazy. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'lib/Makefile')
-rw-r--r--lib/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/Makefile b/lib/Makefile
index bc4073a8cd08..bdfc284c1d5a 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -196,6 +196,8 @@ obj-$(CONFIG_ASN1) += asn1_decoder.o
obj-$(CONFIG_FONT_SUPPORT) += fonts/
+obj-$(CONFIG_PRIME_NUMBERS) += prime_numbers.o
+
hostprogs-y := gen_crc32table
clean-files := crc32table.h