Merge commit 'a849088aa1' from rmk/fixes into cleanup/io-pci

[~andy/linux] / lib / Makefile

diff --git a/lib/Makefile b/lib/Makefile
index 9cb4104f47d91e97560c3aadbf03bcbfaa6a0d77..42d283edc4d3157cc81f897c51fd4ee20a615b62 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -11,7 +11,7 @@ lib-y := ctype.o string.o vsprintf.o cmdline.o \
         rbtree.o radix-tree.o dump_stack.o timerqueue.o\
         idr.o int_sqrt.o extable.o prio_tree.o \
         sha1.o md5.o irq_regs.o reciprocal_div.o argv_split.o \
-        proportions.o prio_heap.o ratelimit.o show_mem.o \
+        proportions.o flex_proportions.o prio_heap.o ratelimit.o show_mem.o \
         is_single_threaded.o plist.o decompress.o
 
 lib-$(CONFIG_MMU) += ioremap.o