summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2005-10-14 15:59:01 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-14 17:10:12 -0700
commit6edb7467be2195e7eeb6844e37668253af216100 (patch)
tree26345960976935682a7abd5c7696b9eab798bc4a
parent43d2c4ca385b02ab7a604aa09a9da36f1668bee6 (diff)
downloadlinux-3.10-6edb7467be2195e7eeb6844e37668253af216100.tar.gz
linux-3.10-6edb7467be2195e7eeb6844e37668253af216100.tar.bz2
linux-3.10-6edb7467be2195e7eeb6844e37668253af216100.zip
[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>
-rw-r--r--drivers/video/sa1100fb.c2
1 files changed, 2 insertions, 0 deletions
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():