diff options
| author |   Hans de Goede <hdegoede@redhat.com> | 2014-11-25 12:13:30 +0100 |
|---|---|---|
| committer |   Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-11-25 14:10:28 +0200 |
| commit | 8284731eb59e843a0608baf18828e0ad0d7f9d79 (patch) | |
| tree | 76ebeeedb5dc4988999376e99dd893d44b6db374 /drivers/video/fbdev | |
| parent | simplefb: Change simplefb_init from module_init to fs_initcall (diff) | |
| download | linux-dev-8284731eb59e843a0608baf18828e0ad0d7f9d79.tar.xz linux-dev-8284731eb59e843a0608baf18828e0ad0d7f9d79.zip | |
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/fbdev')
| -rw-r--r-- | drivers/video/fbdev/simplefb.c | 4 |
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, 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. * |