40 lines
1.1 KiB
Diff
40 lines
1.1 KiB
Diff
From b516039bf5ce5464bc9a6eefac50c87415c9f318 Mon Sep 17 00:00:00 2001
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
|
Date: Tue, 25 Nov 2014 12:13:30 +0100
|
|
Subject: [PATCH 06/15] simplefb: Fix build errors when CONFIG_COMMON_CLK is
|
|
not defined
|
|
Origin: https://git.kernel.org/linus/8284731eb59e843a0608baf18828e0ad0d7f9d79
|
|
|
|
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>
|
|
---
|
|
drivers/video/fbdev/simplefb.c | 4 ++--
|
|
1 file 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.
|
|
*
|
|
--
|
|
2.1.4
|
|
|