diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-22 02:51:34 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-22 02:51:34 -0400 |
| commit | 985990137e81ca9fd6561cd0f7d1a9695ec57d5a (patch) | |
| tree | 7a67493285623a7356ba7065cada6728993d1a3b /drivers/video/sa1100fb.c | |
| parent | 834289447542b7ec55c0847486616d4d53ddf891 (diff) | |
| parent | 63172cb3d5ef762dcb60a292bc7f016b85cf6e1f (diff) | |
Merge changes from linux-2.6 by hand
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, | |||
| 592 | return ret; | 592 | return ret; |
| 593 | } | 593 | } |
| 594 | 594 | ||
| 595 | #ifdef CONFIG_CPU_FREQ | ||
| 595 | /* | 596 | /* |
| 596 | * sa1100fb_display_dma_period() | 597 | * sa1100fb_display_dma_period() |
| 597 | * Calculate the minimum period (in picoseconds) between two DMA | 598 | * 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 | |||
| 606 | */ | 607 | */ |
| 607 | return var->pixclock * 8 * 16 / var->bits_per_pixel; | 608 | return var->pixclock * 8 * 16 / var->bits_per_pixel; |
| 608 | } | 609 | } |
| 610 | #endif | ||
| 609 | 611 | ||
| 610 | /* | 612 | /* |
| 611 | * sa1100fb_check_var(): | 613 | * sa1100fb_check_var(): |