From: Pavel Machek <pavel@ucw.cz>
Date: Fri, 14 Oct 2005 22:59:01 +0000 (-0700)
Subject: [PATCH] zaurus: fix compilation with cpufreq disabled
X-Git-Tag: v2.6.14-rc5~59
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6edb7467be2195e7eeb6844e37668253af216100;p=linux-2.6-omap-h63xx.git

[PATCH] zaurus: fix compilation with cpufreq disabled

This fixes compilation with CPU_FREQ disabled.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c
index beeec7b5142..8000890e427 100644
--- a/drivers/video/sa1100fb.c
+++ b/drivers/video/sa1100fb.c
@@ -592,6 +592,7 @@ sa1100fb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
 	return ret;
 }
 
+#ifdef CONFIG_CPU_FREQ
 /*
  *  sa1100fb_display_dma_period()
  *    Calculate the minimum period (in picoseconds) between two DMA
@@ -606,6 +607,7 @@ static inline unsigned int sa1100fb_display_dma_period(struct fb_var_screeninfo
 	 */
 	return var->pixclock * 8 * 16 / var->bits_per_pixel;
 }
+#endif
 
 /*
  *  sa1100fb_check_var():