diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-07-28 04:30:20 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-07-28 04:30:20 -0400 |
| commit | 661299d9d0437a0ff72240f3d60016ac3a361a6e (patch) | |
| tree | 765512576314fc3612b503f182b9ae4e60fcf849 /lib/Makefile | |
| parent | 05caac585f8abd6c0113856bc8858e3ef214d8a6 (diff) | |
| parent | 41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af (diff) | |
Merge with Linus' 2.6 tree
Diffstat (limited to 'lib/Makefile')
| -rw-r--r-- | lib/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Makefile b/lib/Makefile index beed1585294c..f28d9031303c 100644 --- a/lib/Makefile +++ b/lib/Makefile | |||
| @@ -5,11 +5,11 @@ | |||
| 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 | idr.o div64.o int_sqrt.o bitmap.o extable.o prio_tree.o \ | 7 | idr.o div64.o int_sqrt.o bitmap.o extable.o prio_tree.o \ |
| 8 | sha1.o halfmd4.o | 8 | sha1.o |
| 9 | 9 | ||
| 10 | lib-y += kobject.o kref.o kobject_uevent.o klist.o | 10 | lib-y += kobject.o kref.o kobject_uevent.o klist.o |
| 11 | 11 | ||
| 12 | obj-y += sort.o parser.o | 12 | obj-y += sort.o parser.o halfmd4.o |
| 13 | 13 | ||
| 14 | ifeq ($(CONFIG_DEBUG_KOBJECT),y) | 14 | ifeq ($(CONFIG_DEBUG_KOBJECT),y) |
| 15 | CFLAGS_kobject.o += -DDEBUG | 15 | CFLAGS_kobject.o += -DDEBUG |