From 75405fec850c1688482157b0eb90838f9771cfac Mon Sep 17 00:00:00 2001 From: Zhipeng Wang Date: Mon, 26 Feb 2024 18:14:30 +0900 Subject: [PATCH] ANDROID: fix frame buffer device driver modularization issues Modularizing frame buffer device driver will enable CONFIG_FB_DEVICE, which will change the member variable dev in the structure fb_info. This can lead to "disagrees about version of symbol" problems. This modification was made with the goal of enabling modular frame buffer device driver support. Bug: 326859623 Fixes: 701d2054fa31 ("fbdev: Make support for userspace interfaces configurable") Change-Id: Ic6e35b10ba7e109cb21cdf009d02cd50469eaa91 Signed-off-by: Zhipeng Wang (cherry picked from commit 42c7233dd9c12cd4b44b8fc79e31c20591a003a6) --- include/linux/fb.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/linux/fb.h b/include/linux/fb.h index 267b59ead432..cbca06224843 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -489,9 +489,7 @@ struct fb_info { const struct fb_ops *fbops; struct device *device; /* This is the parent */ -#if defined(CONFIG_FB_DEVICE) struct device *dev; /* This is this fb device */ -#endif int class_flag; /* private sysfs flags */ #ifdef CONFIG_FB_TILEBLITTING struct fb_tile_ops *tileops; /* Tile Blitting */