net: Fix recursive descent in __scm_destroy().

[linux-2.6-omap-h63xx.git] / lib / Makefile

diff --git a/lib/Makefile b/lib/Makefile
index 44001af76a7dfc4f44216fa25959291633df36e7..7cb65d85aeb0fd41142facc52c01c365ca2cc729 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -2,7 +2,7 @@
 # Makefile for some libs needed in the kernel.
 #
 
-ifdef CONFIG_FTRACE
+ifdef CONFIG_FUNCTION_TRACER
 ORIG_CFLAGS := $(KBUILD_CFLAGS)
 KBUILD_CFLAGS = $(subst -pg,,$(ORIG_CFLAGS))
 endif
@@ -81,6 +81,8 @@ obj-$(CONFIG_HAVE_LMB) += lmb.o
 
 obj-$(CONFIG_HAVE_ARCH_TRACEHOOK) += syscall.o
 
+obj-$(CONFIG_DYNAMIC_PRINTK_DEBUG) += dynamic_printk.o
+
 hostprogs-y    := gen_crc32table
 clean-files    := crc32table.h