From: Pawel Moll Date: Fri, 1 Aug 2014 14:43:34 +0000 (+0100) Subject: video: ARM CLCD: Fix DT-related build problems X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1d5167b72ca05b2096760e1200fcd53b5f9a7562;p=linux-beck.git video: ARM CLCD: Fix DT-related build problems This patch fixes the following error when !CONFIG_OF: drivers/video/fbdev/amba-clcd.c:800:54: warning: ‘struct amba_dev’ declared inside parameter list [enabled by default] static struct clcd_board *clcdfb_of_get_board(struct amba_dev *dev) ^ and adds a missing Kconfig select causing this when CONFIG_OF && !CONFIG_FB_MODE_HELPERS: drivers/video/fbdev/amba-clcd.c:567: undefined reference to `fb_videomode_from_videomode' Reported-by: Fengguang Wu Signed-off-by: Pawel Moll Signed-off-by: Tomi Valkeinen --- diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index 6f451ad34afc..ef946236f09e 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -280,6 +280,7 @@ config FB_ARMCLCD select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT + select FB_MODE_HELPERS if OF select VIDEOMODE_HELPERS if OF help This framebuffer device driver is for the ARM PrimeCell PL110 diff --git a/drivers/video/fbdev/amba-clcd.c b/drivers/video/fbdev/amba-clcd.c index 23b35194dee3..beadd3edaa17 100644 --- a/drivers/video/fbdev/amba-clcd.c +++ b/drivers/video/fbdev/amba-clcd.c @@ -797,7 +797,7 @@ static struct clcd_board *clcdfb_of_get_board(struct amba_device *dev) return board; } #else -static struct clcd_board *clcdfb_of_get_board(struct amba_dev *dev) +static struct clcd_board *clcdfb_of_get_board(struct amba_device *dev) { return NULL; }