Commit 4600ecfc authored Feb 08, 2008 by Guennadi Liakhovetski Committed by Linus Torvalds Feb 08, 2008

lib/scatterlist.o needed by a module only - link it in unconditionally



lib/scatterlist.c is needed by drivers/media/video/videobuf-dma-sg.c, and
we would like to be able to use the latter without PCI too, for example, on
PXA270 ARM CPU.  It is then possible to create a configuration with
CONFIG_BLOCK=n, where only module code will need scatterlist.c.  Therefore
it must be in obj-y.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de>
Acked-by: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 3a984a85

lib/Makefile

+2 −2

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@ lib-y := ctype.o string.o vsprintf.o cmdline.o \
		rbtree.o radix-tree.o dump_stack.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 scatterlist.o
		proportions.o prio_heap.o

		lib-$(CONFIG_MMU) += ioremap.o
		lib-$(CONFIG_SMP) += cpumask.o
		@@ -14,7 +14,7 @@ lib-$(CONFIG_SMP) += cpumask.o
		lib-y += kobject.o kref.o klist.o

		obj-y += div64.o sort.o parser.o halfmd4.o debug_locks.o random32.o \
		bust_spinlocks.o hexdump.o kasprintf.o bitmap.o
		bust_spinlocks.o hexdump.o kasprintf.o bitmap.o scatterlist.o

		ifeq ($(CONFIG_DEBUG_KOBJECT),y)
		CFLAGS_kobject.o += -DDEBUG

Admin message