Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

framebuffer: don't link fb_devio into kernel image unconditionally

CONFIG_FB_DEFERRED_IO is defined as bool while CONFIG_FB is defined as
tristate. Currently fb_defio.o is linked into the kernel image even if
CONFIG_FB=m.

I fix this by updating the Makefile to link fb_defio.o into fb.o and thus
go into one place with the other core framebuffer code.

Signed-off-by: Harald Geyer <harald@ccbib.org>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

authored by

Harald Geyer and committed by
Tomi Valkeinen
a7c42990 5ebe6afa

+1 -3
+1 -1
drivers/video/fbdev/core/Makefile
··· 3 3 obj-$(CONFIG_FB) += fb.o 4 4 fb-y := fbmem.o fbmon.o fbcmap.o fbsysfs.o \ 5 5 modedb.o fbcvt.o 6 + fb-$(CONFIG_FB_DEFERRED_IO) += fb_defio.o 6 7 fb-objs := $(fb-y) 7 8 8 9 obj-$(CONFIG_FB_CFB_FILLRECT) += cfbfillrect.o ··· 15 14 obj-$(CONFIG_FB_SYS_FOPS) += fb_sys_fops.o 16 15 obj-$(CONFIG_FB_SVGALIB) += svgalib.o 17 16 obj-$(CONFIG_FB_DDC) += fb_ddc.o 18 - obj-$(CONFIG_FB_DEFERRED_IO) += fb_defio.o
-2
drivers/video/fbdev/core/fb_defio.c
··· 242 242 mutex_destroy(&fbdefio->lock); 243 243 } 244 244 EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup); 245 - 246 - MODULE_LICENSE("GPL");