Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4600ecfc authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Linus Torvalds
Browse files

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: default avatarGuennadi Liakhovetski <g.liakhovetski@pengutronix.de>
Acked-by: default avatarJens Axboe <jens.axboe@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3a984a85

lib/Makefile

+2 −2
Original line number Original line 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 \

	 rbtree.o radix-tree.o dump_stack.o \

	 idr.o int_sqrt.o extable.o prio_tree.o \

	 idr.o int_sqrt.o extable.o prio_tree.o \

	 sha1.o irq_regs.o reciprocal_div.o argv_split.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_MMU) += ioremap.o

lib-$(CONFIG_SMP) += cpumask.o

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

lib-y	+= kobject.o kref.o klist.o





obj-y += div64.o sort.o parser.o halfmd4.o debug_locks.o random32.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)

ifeq ($(CONFIG_DEBUG_KOBJECT),y)

CFLAGS_kobject.o += -DDEBUG

CFLAGS_kobject.o += -DDEBUG