diff options
author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-04-25 15:58:38 -0400 |
---|---|---|
committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-04-25 15:58:38 -0400 |
commit | ca1841de3a426de8cfac6ca61f0f54e6283d0653 (patch) | |
tree | fc9ca7db1f9ada5301b3684ae75cfe8470071425 /lib/Makefile | |
parent | c5325bf1df96152c969b44cae2b8131be5621c47 (diff) | |
parent | 8fd62c82872a5a721c9fb0071ca0f7a49c1732e4 (diff) |
Merge commit 'v2.6.38.4' into linaro-2.6.38
Diffstat (limited to 'lib/Makefile')
-rw-r--r-- | lib/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/Makefile b/lib/Makefile index cbb774f7d41..dfbf7d82ce9 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -22,6 +22,8 @@ lib-y += kobject.o kref.o klist.o obj-y += bcd.o div64.o sort.o parser.o halfmd4.o debug_locks.o random32.o \ bust_spinlocks.o hexdump.o kasprintf.o bitmap.o scatterlist.o \ string_helpers.o gcd.o lcm.o list_sort.o uuid.o flex_array.o +obj-y += kstrtox.o +obj-$(CONFIG_TEST_KSTRTOX) += test-kstrtox.o ifeq ($(CONFIG_DEBUG_KOBJECT),y) CFLAGS_kobject.o += -DDEBUG |