Merge remote-tracking branch 'torvalds/master' into perf/urgent

[linux-2.6-microblaze.git] / lib / Makefile

diff --git a/lib/Makefile b/lib/Makefile
index b5307d3..e11cfc1 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -280,6 +280,7 @@ obj-$(CONFIG_INTERVAL_TREE_TEST) += interval_tree_test.o
 obj-$(CONFIG_PERCPU_TEST) += percpu_test.o
 
 obj-$(CONFIG_ASN1) += asn1_decoder.o
+obj-$(CONFIG_ASN1_ENCODER) += asn1_encoder.o
 
 obj-$(CONFIG_FONT_SUPPORT) += fonts/