From 66bed2751faa04c8891196e2858a3087d6d8b55f Mon Sep 17 00:00:00 2001
From: Pavel Machek <pavel@ucw.cz>
Date: Fri, 14 Oct 2005 15:59:01 -0700
Subject: [PATCH] --- yaml --- r: 9869 b: refs/heads/master c:
 6edb7467be2195e7eeb6844e37668253af216100 h: refs/heads/master i:   9867:
 614f69034fa072b117cd9c71b32d12b3f98e8a97 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/video/sa1100fb.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 08896c2bc517..6c50175fcc63 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43d2c4ca385b02ab7a604aa09a9da36f1668bee6
+refs/heads/master: 6edb7467be2195e7eeb6844e37668253af216100
diff --git a/trunk/drivers/video/sa1100fb.c b/trunk/drivers/video/sa1100fb.c
index beeec7b51425..8000890e4271 100644
--- a/trunk/drivers/video/sa1100fb.c
+++ b/trunk/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():