Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / lib / Makefile

diff --git a/lib/Makefile b/lib/Makefile
index b98df505f335de2e6562c3196d72f924f57f7f10..8c31a0cb75e97746af1cd02906ac149105250cc2 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -126,6 +126,9 @@ obj-$(CONFIG_CLZ_TAB) += clz_tab.o
 obj-$(CONFIG_DDR) += jedec_ddr_data.o
 
 obj-$(CONFIG_GENERIC_STRNCPY_FROM_USER) += strncpy_from_user.o
+obj-$(CONFIG_GENERIC_STRNLEN_USER) += strnlen_user.o
+
+obj-$(CONFIG_STMP_DEVICE) += stmp_device.o
 
 hostprogs-y    := gen_crc32table
 clean-files    := crc32table.h