summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorPawel Moll <pawel.moll@arm.com>2014-08-01 15:43:34 +0100
committerTomi Valkeinen <tomi.valkeinen@ti.com>2014-08-04 09:31:35 +0300
commit1d5167b72ca05b2096760e1200fcd53b5f9a7562 (patch)
tree15e3b23fb3d6877814dce3b354b40d608612f001 /drivers/video
parentd7aa64c32bdcb2c1bc5932b3d2927863ae31ccbc (diff)
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 <fengguang.wu@intel.com> Signed-off-by: Pawel Moll <pawel.moll@arm.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbdev/Kconfig1
-rw-r--r--drivers/video/fbdev/amba-clcd.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
index 6f451ad34af..ef946236f09 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 23b35194dee..beadd3edaa1 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;
}