diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-28 16:51:05 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-28 16:51:05 -0500 |
| commit | 68fbda7de07e56eb90dd6e58a162527411b388b1 (patch) | |
| tree | 118f82bb86fdf9dd3480ccabf96a7e5d3ab8bdb9 /lib/Makefile | |
| parent | d4928196fe9ec07d18139ba2735876b0c8aa738f (diff) | |
| parent | 7cedb1f17fb7f4374d11501f61656ae9d3ba47e9 (diff) | |
Merge branch 'sg' of git://git.kernel.dk/linux-2.6-block
* 'sg' of git://git.kernel.dk/linux-2.6-block:
SG: work with the SCSI fixed maximum allocations.
SG: Convert SCSI to use scatterlist helpers for sg chaining
SG: Move functions to lib/scatterlist.c and add sg chaining allocator helpers
Diffstat (limited to 'lib/Makefile')
| -rw-r--r-- | lib/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Makefile b/lib/Makefile index b6793ed28d84..89841dc9d91c 100644 --- a/lib/Makefile +++ b/lib/Makefile | |||
| @@ -6,7 +6,7 @@ lib-y := ctype.o string.o vsprintf.o cmdline.o \ | |||
| 6 | rbtree.o radix-tree.o dump_stack.o \ | 6 | rbtree.o radix-tree.o dump_stack.o \ |
| 7 | idr.o int_sqrt.o extable.o prio_tree.o \ | 7 | idr.o int_sqrt.o extable.o prio_tree.o \ |
| 8 | sha1.o irq_regs.o reciprocal_div.o argv_split.o \ | 8 | sha1.o irq_regs.o reciprocal_div.o argv_split.o \ |
| 9 | proportions.o prio_heap.o | 9 | proportions.o prio_heap.o scatterlist.o |
| 10 | 10 | ||
| 11 | lib-$(CONFIG_MMU) += ioremap.o | 11 | lib-$(CONFIG_MMU) += ioremap.o |
| 12 | lib-$(CONFIG_SMP) += cpumask.o | 12 | lib-$(CONFIG_SMP) += cpumask.o |