aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2014-11-25 06:13:30 -0500
committerTomi Valkeinen <tomi.valkeinen@ti.com>2014-11-25 07:10:28 -0500
commit8284731eb59e843a0608baf18828e0ad0d7f9d79 (patch)
tree76ebeeedb5dc4988999376e99dd893d44b6db374
parent0c5b240c7e0a7af56afd24db6570fa84d67728c2 (diff)
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>
-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 8be9754c9fe9..b2ae9254fd75 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,
169 169
170struct simplefb_par { 170struct simplefb_par {
171 u32 palette[PSEUDO_PALETTE_SIZE]; 171 u32 palette[PSEUDO_PALETTE_SIZE];
172#ifdef CONFIG_OF 172#if defined CONFIG_OF && defined CONFIG_COMMON_CLK
173 int clk_count; 173 int clk_count;
174 struct clk **clks; 174 struct clk **clks;
175#endif 175#endif
176}; 176};
177 177
178#ifdef CONFIG_OF 178#if defined CONFIG_OF && defined CONFIG_COMMON_CLK
179/* 179/*
180 * Clock handling code. 180 * Clock handling code.
181 * 181 *