aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2004-06-10 11:02:41 +0100
committerAnton Altaparmakov <aia21@cantab.net>2004-06-10 11:02:41 +0100
commit62eed9863805fd3daaad4cf050c5eee7297f7e62 (patch)
tree98c4943df46c36b4ded44132f069b6c19a370465 /Documentation
parent31ba0466b86c6494b59e139ad98b90a32e53fdc1 (diff)
parent3c3daf3149fa00b66580098449ba4d2040e97c09 (diff)
downloadhistory-62eed9863805fd3daaad4cf050c5eee7297f7e62.tar.gz
Merge cantab.net:/home/src/bklinux-2.6
into cantab.net:/home/src/ntfs-2.6
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/fb/framebuffer.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/fb/framebuffer.txt b/Documentation/fb/framebuffer.txt
index b8d0b78f4a787b..610e7801207b52 100644
--- a/Documentation/fb/framebuffer.txt
+++ b/Documentation/fb/framebuffer.txt
@@ -190,7 +190,7 @@ We'll say that the horizontal scanrate is about 31 kHz:
1/(32.141E-6 s) = 31.113E3 Hz
A full screen counts 480 (yres) lines, but we have to consider the vertical
-retrace too (e.g. 49 `pixels'). So a full screen will take
+retrace too (e.g. 49 `lines'). So a full screen will take
(480+49)*32.141E-6 s = 17.002E-3 s