Commit a7c42990 authored by Harald Geyer's avatar Harald Geyer Committed by Tomi Valkeinen
Browse files

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: default avatarHarald Geyer <harald@ccbib.org>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 5ebe6afa

drivers/video/fbdev/core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ obj-$(CONFIG_FB_CMDLINE) += fb_cmdline.o 
obj-$(CONFIG_FB)                  += fb.o

fb-y                              := fbmem.o fbmon.o fbcmap.o fbsysfs.o \

                                     modedb.o fbcvt.o

fb-$(CONFIG_FB_DEFERRED_IO)       += fb_defio.o

fb-objs                           := $(fb-y)



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_SVGALIB)       += svgalib.o

obj-$(CONFIG_FB_DDC)           += fb_ddc.o
 
obj-$(CONFIG_FB_DEFERRED_IO)   += fb_defio.o

drivers/video/fbdev/core/fb_defio.c

+0 −2
Original line number Diff line number Diff line
@@ -242,5 +242,3 @@ void fb_deferred_io_cleanup(struct fb_info *info) 
	mutex_destroy(&fbdefio->lock);

}

EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup);
 


MODULE_LICENSE("GPL");