diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-08 15:19:24 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-08 15:19:24 -0400 |
| commit | b612cacb02f0fb58f07a9002c7719a901882718c (patch) | |
| tree | f528e2ee1b39ad3c70336b29469d0b5645bc9e97 /drivers/video | |
| parent | 7a91bf7f5c22c8407a9991cbd9ce5bb87caa6b4a (diff) | |
| parent | 71abe99980e6d7ff8aee8acc7da817b3ad7d8a89 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/sa1100fb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c index 2d29db7ef80..beeec7b5142 100644 --- a/drivers/video/sa1100fb.c +++ b/drivers/video/sa1100fb.c | |||
| @@ -598,7 +598,7 @@ sa1100fb_setcolreg(u_int regno, u_int red, u_int green, u_int blue, | |||
| 598 | * requests for the LCD controller. If we hit this, it means we're | 598 | * requests for the LCD controller. If we hit this, it means we're |
| 599 | * doing nothing but LCD DMA. | 599 | * doing nothing but LCD DMA. |
| 600 | */ | 600 | */ |
| 601 | static unsigned int sa1100fb_display_dma_period(struct fb_var_screeninfo *var) | 601 | static inline unsigned int sa1100fb_display_dma_period(struct fb_var_screeninfo *var) |
| 602 | { | 602 | { |
| 603 | /* | 603 | /* |
| 604 | * Period = pixclock * bits_per_byte * bytes_per_transfer | 604 | * Period = pixclock * bits_per_byte * bytes_per_transfer |