summaryrefslogtreecommitdiffstats
path: root/lib/Makefile
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2010-12-09 12:02:18 -0800
committerJohn Stultz <john.stultz@linaro.org>2010-12-10 11:52:17 -0800
commit1f5a24794a54588ea3a9efd521be31d826e0b9d7 (patch)
tree58dd33af6093cd3a0fed59a12ed41d6c7d8083ba /lib/Makefile
parent87de5ac782761a3ebf806e434e8c9cc205a87274 (diff)
downloadlinux-stable-1f5a24794a54588ea3a9efd521be31d826e0b9d7.tar.gz
linux-stable-1f5a24794a54588ea3a9efd521be31d826e0b9d7.tar.bz2
linux-stable-1f5a24794a54588ea3a9efd521be31d826e0b9d7.zip
timers: Rename timerlist infrastructure to timerqueue
Thomas pointed out a namespace collision between the new timerlist infrastructure I introduced and the existing timer_list.c So to avoid confusion, I've renamed the timerlist infrastructure to timerqueue. Reported-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: John Stultz <john.stultz@linaro.org>
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 8b475cfb8195..9e2db72d128e 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -8,7 +8,7 @@ KBUILD_CFLAGS = $(subst -pg,,$(ORIG_CFLAGS))
endif
lib-y := ctype.o string.o vsprintf.o cmdline.o \
- rbtree.o radix-tree.o dump_stack.o timerlist.o\
+ rbtree.o radix-tree.o dump_stack.o timerqueue.o\
idr.o int_sqrt.o extable.o prio_tree.o \
sha1.o irq_regs.o reciprocal_div.o argv_split.o \
proportions.o prio_heap.o ratelimit.o show_mem.o \