diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-26 18:04:59 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-26 18:04:59 -0400 |
| commit | d9ecdb282c91952796b7542c4f57fd6de6948d7b (patch) | |
| tree | fd4de7923968afa7d2981fb037e2255fc2cfa1e1 /lib/Makefile | |
| parent | 4ef584ba84125b67c17b5aded38e7783cd8cdef0 (diff) | |
| parent | 1d1f8b377c48e5aeddaea52eba74cc0539f088cd (diff) | |
Merge branch 'for_rmk_13' of git://git.mnementh.co.uk/linux-2.6-im
Diffstat (limited to 'lib/Makefile')
| -rw-r--r-- | lib/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/Makefile b/lib/Makefile index 9085ad6fa53d..3b1f94bbe9de 100644 --- a/lib/Makefile +++ b/lib/Makefile | |||
| @@ -11,7 +11,7 @@ lib-y := ctype.o string.o vsprintf.o cmdline.o \ | |||
| 11 | rbtree.o radix-tree.o dump_stack.o \ | 11 | rbtree.o radix-tree.o dump_stack.o \ |
| 12 | idr.o int_sqrt.o extable.o prio_tree.o \ | 12 | idr.o int_sqrt.o extable.o prio_tree.o \ |
| 13 | sha1.o irq_regs.o reciprocal_div.o argv_split.o \ | 13 | sha1.o irq_regs.o reciprocal_div.o argv_split.o \ |
| 14 | proportions.o prio_heap.o ratelimit.o | 14 | proportions.o prio_heap.o ratelimit.o show_mem.o |
| 15 | 15 | ||
| 16 | lib-$(CONFIG_MMU) += ioremap.o | 16 | lib-$(CONFIG_MMU) += ioremap.o |
| 17 | lib-$(CONFIG_SMP) += cpumask.o | 17 | lib-$(CONFIG_SMP) += cpumask.o |
| @@ -78,6 +78,8 @@ lib-$(CONFIG_GENERIC_BUG) += bug.o | |||
| 78 | 78 | ||
| 79 | obj-$(CONFIG_HAVE_LMB) += lmb.o | 79 | obj-$(CONFIG_HAVE_LMB) += lmb.o |
| 80 | 80 | ||
| 81 | obj-$(CONFIG_HAVE_ARCH_TRACEHOOK) += syscall.o | ||
| 82 | |||
| 81 | hostprogs-y := gen_crc32table | 83 | hostprogs-y := gen_crc32table |
| 82 | clean-files := crc32table.h | 84 | clean-files := crc32table.h |
| 83 | 85 | ||