From a7c42990f1bed8665037fd5a3848ffb02de3b553 Mon Sep 17 00:00:00 2001 From: Harald Geyer Date: Tue, 28 Apr 2015 13:17:49 +0200 Subject: 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 Signed-off-by: Tomi Valkeinen --- drivers/video/fbdev/core/fb_defio.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'drivers/video/fbdev/core/fb_defio.c') diff --git a/drivers/video/fbdev/core/fb_defio.c b/drivers/video/fbdev/core/fb_defio.c index d6cab1fd9a47..3fc63c208d08 100644 --- a/drivers/video/fbdev/core/fb_defio.c +++ b/drivers/video/fbdev/core/fb_defio.c @@ -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"); -- cgit v1.2.3