diff options
author | Tony Luck <tony.luck@intel.com> | 2005-06-21 19:21:20 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-06-21 19:21:20 -0400 |
commit | 29516d75a0b09e0a0328dd55c98a342515c9615a (patch) | |
tree | 4b03326311958ad6de82653a1caf289ad8c38538 /lib/Makefile | |
parent | 4ea78729b8dbfc400fe165a57b90a394a7275a54 (diff) | |
parent | 4a4f8fdba6f5a34ca90f426021e17491a30202da (diff) |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'lib/Makefile')
-rw-r--r-- | lib/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/Makefile b/lib/Makefile index 7c70db79c0e0..9eccea9429a7 100644 --- a/lib/Makefile +++ b/lib/Makefile | |||
@@ -4,9 +4,10 @@ | |||
4 | 4 | ||
5 | lib-y := errno.o ctype.o string.o vsprintf.o cmdline.o \ | 5 | lib-y := errno.o ctype.o string.o vsprintf.o cmdline.o \ |
6 | bust_spinlocks.o rbtree.o radix-tree.o dump_stack.o \ | 6 | bust_spinlocks.o rbtree.o radix-tree.o dump_stack.o \ |
7 | kobject.o kref.o idr.o div64.o int_sqrt.o \ | 7 | idr.o div64.o int_sqrt.o bitmap.o extable.o prio_tree.o \ |
8 | bitmap.o extable.o kobject_uevent.o prio_tree.o sha1.o \ | 8 | sha1.o halfmd4.o |
9 | halfmd4.o | 9 | |
10 | lib-y += kobject.o kref.o kobject_uevent.o klist.o | ||
10 | 11 | ||
11 | obj-y += sort.o parser.o | 12 | obj-y += sort.o parser.o |
12 | 13 | ||