Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

[mirror_ubuntu-bionic-kernel.git] / lib / Makefile

diff --git a/lib/Makefile b/lib/Makefile
index fea8f9035f07c13afb770f5781fa145d9dd6b70f..2d6106af53cdf88773e2798a2c90cad0cb6cee53 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -35,6 +35,7 @@ ifneq ($(CONFIG_HAVE_DEC_LOCK),y)
   lib-y += dec_and_lock.o
 endif
 
+obj-$(CONFIG_BITREVERSE) += bitrev.o
 obj-$(CONFIG_CRC_CCITT)        += crc-ccitt.o
 obj-$(CONFIG_CRC16)    += crc16.o
 obj-$(CONFIG_CRC32)    += crc32.o
@@ -54,6 +55,9 @@ obj-$(CONFIG_SMP) += percpu_counter.o
 obj-$(CONFIG_AUDIT_GENERIC) += audit.o
 
 obj-$(CONFIG_SWIOTLB) += swiotlb.o
+obj-$(CONFIG_FAULT_INJECTION) += fault-inject.o
+
+lib-$(CONFIG_GENERIC_BUG) += bug.o
 
 hostprogs-y    := gen_crc32table
 clean-files    := crc32table.h