summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2014-11-25 12:13:30 +0100
committerTomi Valkeinen <tomi.valkeinen@ti.com>2014-11-25 14:10:28 +0200
commit8284731eb59e843a0608baf18828e0ad0d7f9d79 (patch)
tree76ebeeedb5dc4988999376e99dd893d44b6db374 /drivers/video
parent0c5b240c7e0a7af56afd24db6570fa84d67728c2 (diff)
downloadop-kernel-dev-8284731eb59e843a0608baf18828e0ad0d7f9d79.zip
op-kernel-dev-8284731eb59e843a0608baf18828e0ad0d7f9d79.tar.gz
simplefb: Fix build errors when CONFIG_COMMON_CLK is not defined
Both CONFIG_OF and CONFIG_COMMON_CLK must be defined to be able to use of clocks. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbdev/simplefb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/fbdev/simplefb.c b/drivers/video/fbdev/simplefb.c
index 8be9754..b2ae925 100644
--- a/drivers/video/fbdev/simplefb.c
+++ b/drivers/video/fbdev/simplefb.c
@@ -169,13 +169,13 @@ static int simplefb_parse_pd(struct platform_device *pdev,
struct simplefb_par {
u32 palette[PSEUDO_PALETTE_SIZE];
-#ifdef CONFIG_OF
+#if defined CONFIG_OF && defined CONFIG_COMMON_CLK
int clk_count;
struct clk **clks;
#endif
};
-#ifdef CONFIG_OF
+#if defined CONFIG_OF && defined CONFIG_COMMON_CLK
/*
* Clock handling code.
*
OpenPOWER on IntegriCloud