mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 16:37:50 +00:00
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>
This commit is contained in:
parent
5ebe6afaf0
commit
a7c42990f1
2 changed files with 1 additions and 3 deletions
|
@ -3,6 +3,7 @@ obj-$(CONFIG_FB_CMDLINE) += fb_cmdline.o
|
||||||
obj-$(CONFIG_FB) += fb.o
|
obj-$(CONFIG_FB) += fb.o
|
||||||
fb-y := fbmem.o fbmon.o fbcmap.o fbsysfs.o \
|
fb-y := fbmem.o fbmon.o fbcmap.o fbsysfs.o \
|
||||||
modedb.o fbcvt.o
|
modedb.o fbcvt.o
|
||||||
|
fb-$(CONFIG_FB_DEFERRED_IO) += fb_defio.o
|
||||||
fb-objs := $(fb-y)
|
fb-objs := $(fb-y)
|
||||||
|
|
||||||
obj-$(CONFIG_FB_CFB_FILLRECT) += cfbfillrect.o
|
obj-$(CONFIG_FB_CFB_FILLRECT) += cfbfillrect.o
|
||||||
|
@ -14,4 +15,3 @@ obj-$(CONFIG_FB_SYS_IMAGEBLIT) += sysimgblt.o
|
||||||
obj-$(CONFIG_FB_SYS_FOPS) += fb_sys_fops.o
|
obj-$(CONFIG_FB_SYS_FOPS) += fb_sys_fops.o
|
||||||
obj-$(CONFIG_FB_SVGALIB) += svgalib.o
|
obj-$(CONFIG_FB_SVGALIB) += svgalib.o
|
||||||
obj-$(CONFIG_FB_DDC) += fb_ddc.o
|
obj-$(CONFIG_FB_DDC) += fb_ddc.o
|
||||||
obj-$(CONFIG_FB_DEFERRED_IO) += fb_defio.o
|
|
||||||
|
|
|
@ -242,5 +242,3 @@ void fb_deferred_io_cleanup(struct fb_info *info)
|
||||||
mutex_destroy(&fbdefio->lock);
|
mutex_destroy(&fbdefio->lock);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup);
|
EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup);
|
||||||
|
|
||||||
MODULE_LICENSE("GPL");
|
|
||||||
|
|
Loading…
Reference in a new issue