Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 4600ecfcf3ad160ac0c6fcff6115f6edb081ccfa

Authored by Guennadi Liakhovetski
Committed by Linus Torvalds
1 parent 3a984a8505
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

... ... @@ -6,7 +6,7 @@
6 6 rbtree.o radix-tree.o dump_stack.o \
7 7 idr.o int_sqrt.o extable.o prio_tree.o \
8 8 sha1.o irq_regs.o reciprocal_div.o argv_split.o \
9   - proportions.o prio_heap.o scatterlist.o
  9 + proportions.o prio_heap.o
10 10  
11 11 lib-$(CONFIG_MMU) += ioremap.o
12 12 lib-$(CONFIG_SMP) += cpumask.o
... ... @@ -14,7 +14,7 @@
14 14 lib-y += kobject.o kref.o klist.o
15 15  
16 16 obj-y += div64.o sort.o parser.o halfmd4.o debug_locks.o random32.o \
17   - bust_spinlocks.o hexdump.o kasprintf.o bitmap.o
  17 + bust_spinlocks.o hexdump.o kasprintf.o bitmap.o scatterlist.o
18 18  
19 19 ifeq ($(CONFIG_DEBUG_KOBJECT),y)
20 20 CFLAGS_kobject.o += -DDEBUG