From: Hans de Goede <hdegoede@redhat.com>
Date: Tue, 25 Nov 2014 11:13:30 +0000 (+0100)
Subject: simplefb: Fix build errors when CONFIG_COMMON_CLK is not defined
X-Git-Tag: v3.19-rc1~121^2^3~2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8284731eb59e843a0608baf18828e0ad0d7f9d79;p=uclinux-h8%2Flinux.git

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>
---

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,
 
 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.
  *