diff options
| author | James Morris <jmorris@namei.org> | 2009-03-26 17:28:11 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-03-26 17:28:11 -0400 |
| commit | 1987f17d2266e882862528841429b5bf67bc8fe5 (patch) | |
| tree | 5c3fbee88018ab7259a18c10e6320e575d0ed679 /lib/Makefile | |
| parent | 7198e2eeb44b3fe7cc97f997824002da47a9c644 (diff) | |
| parent | 0384e2959127a56d0640505d004d8dd92f9c29f5 (diff) | |
Merge branch 'master' into next
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 32b0e64ded27..0dd9229fab7e 100644 --- a/lib/Makefile +++ b/lib/Makefile | |||
| @@ -82,7 +82,9 @@ obj-$(CONFIG_HAVE_LMB) += lmb.o | |||
| 82 | 82 | ||
| 83 | obj-$(CONFIG_HAVE_ARCH_TRACEHOOK) += syscall.o | 83 | obj-$(CONFIG_HAVE_ARCH_TRACEHOOK) += syscall.o |
| 84 | 84 | ||
| 85 | obj-$(CONFIG_DYNAMIC_PRINTK_DEBUG) += dynamic_printk.o | 85 | obj-$(CONFIG_DYNAMIC_DEBUG) += dynamic_debug.o |
| 86 | |||
| 87 | obj-$(CONFIG_NLATTR) += nlattr.o | ||
| 86 | 88 | ||
| 87 | hostprogs-y := gen_crc32table | 89 | hostprogs-y := gen_crc32table |
| 88 | clean-files := crc32table.h | 90 | clean-files := crc32table.h |