diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-10-20 10:21:33 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-10-20 10:21:33 +0200 |
| commit | 312f5726055534be1dc9dd369be13aabd2943fcb (patch) | |
| tree | 29394a3f83b4952a73b36a4aa962dfeda839e9db /drivers/video/sa1100fb.c | |
| parent | drm: fix drm PCIGART (diff) | |
| parent | Linux v2.6.14-rc5 (diff) | |
| download | linux-312f5726055534be1dc9dd369be13aabd2943fcb.tar.xz linux-312f5726055534be1dc9dd369be13aabd2943fcb.zip | |
merge Linus head tree into my drm tree and fix up conflicts
Diffstat (limited to 'drivers/video/sa1100fb.c')
| -rw-r--r-- | drivers/video/sa1100fb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c index beeec7b51425..8000890e4271 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(): |