summaryrefslogtreecommitdiff
path: root/lib/Makefile
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-03-16 16:48:05 +0300
committerTakashi Iwai <tiwai@suse.de>2015-03-16 16:48:05 +0300
commit34e72afe73c40d9974c1f230c3b62fc43f5c5b28 (patch)
treefee2be2e3453e246ee55ffb711a36a8ec053361a /lib/Makefile
parente79d74ab25339437447478e4dfe2b35c5b560512 (diff)
parentcc261738add93947d138d2fabad9f4dbed4e5c00 (diff)
downloadlinux-34e72afe73c40d9974c1f230c3b62fc43f5c5b28.tar.xz
Merge branch 'for-linus' into for-next
Diffstat (limited to 'lib/Makefile')
-rw-r--r--lib/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Makefile b/lib/Makefile
index 87eb3bffc283..58f74d2dd396 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -24,7 +24,7 @@ obj-y += lockref.o
obj-y += bcd.o div64.o sort.o parser.o halfmd4.o debug_locks.o random32.o \
bust_spinlocks.o kasprintf.o bitmap.o scatterlist.o \
- gcd.o lcm.o list_sort.o uuid.o flex_array.o clz_ctz.o \
+ gcd.o lcm.o list_sort.o uuid.o flex_array.o iov_iter.o clz_ctz.o \
bsearch.o find_last_bit.o find_next_bit.o llist.o memweight.o kfifo.o \
percpu-refcount.o percpu_ida.o rhashtable.o reciprocal_div.o
obj-y += string_helpers.o