On 03/03/15 15:09, Harald Geyer wrote: > 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. > > This has been tested on arm/sunxi and arm/mxs. > > Signed-off-by: Harald Geyer <harald@xxxxxxxxx> > --- > Resending this patch as I didn't get any reply for over two weeks. > > drivers/video/fbdev/core/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/video/fbdev/core/Makefile b/drivers/video/fbdev/core/Makefile > index 67f28e2..23d86a8 100644 > --- a/drivers/video/fbdev/core/Makefile > +++ b/drivers/video/fbdev/core/Makefile > @@ -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 I think this change makes sense. An alternative would be to make fb_defio tristate, but as fb.ko uses fb_defio, fb_defio will always be loaded if fb is used. And I don't think fb_defio.ko can be used alone, without fb.ko. But if you do link fb_defio into fb.ko, I think you need to remove MODULE_LICENSE() from fb_defio. Tomi
Attachment:
signature.asc
Description: OpenPGP digital signature