diff options
author | H. Peter Anvin <hpa@zytor.com> | 2009-12-11 21:57:42 +0300 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2009-12-11 21:57:42 +0300 |
commit | 5c6baba84e1ac6a79b266b40e17e692aab6604a1 (patch) | |
tree | 6ba34db1109107023d753dd9fd5c359b3b990a04 /drivers/video/gbefb.c | |
parent | 893f38d144a4d96d2483cd7c3801d26e1b2c23e9 (diff) | |
parent | 3ef884b4c04e857c283cc77ca70ad8f638d94b0e (diff) | |
download | linux-5c6baba84e1ac6a79b266b40e17e692aab6604a1.tar.xz |
Merge commit 'linus/master' into x86/urgent
Diffstat (limited to 'drivers/video/gbefb.c')
-rw-r--r-- | drivers/video/gbefb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/gbefb.c b/drivers/video/gbefb.c index f67db4268374..695fa013fe7e 100644 --- a/drivers/video/gbefb.c +++ b/drivers/video/gbefb.c @@ -701,7 +701,7 @@ static int gbefb_set_par(struct fb_info *info) blocks of 512x128, 256x128 or 128x128 pixels, respectively for 8bit, 16bit and 32 bit modes (64 kB). They cover the screen with partial tiles on the right and/or bottom of the screen if needed. - For exemple in 640x480 8 bit mode the mapping is: + For example in 640x480 8 bit mode the mapping is: <-------- 640 -----> <---- 512 ----><128|384 offscreen> |