summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-08-08 12:19:24 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-08 12:19:24 -0700
commitb612cacb02f0fb58f07a9002c7719a901882718c (patch)
treef528e2ee1b39ad3c70336b29469d0b5645bc9e97 /drivers/video
parent7a91bf7f5c22c8407a9991cbd9ce5bb87caa6b4a (diff)
parent71abe99980e6d7ff8aee8acc7da817b3ad7d8a89 (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/sa1100fb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c
index 2d29db7ef800..beeec7b51425 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,
* requests for the LCD controller. If we hit this, it means we're
* doing nothing but LCD DMA.
*/
-static unsigned int sa1100fb_display_dma_period(struct fb_var_screeninfo *var)
+static inline unsigned int sa1100fb_display_dma_period(struct fb_var_screeninfo *var)
{
/*
* Period = pixclock * bits_per_byte * bytes_per_transfer