Merge branches 'release', 'asus', 'sony-laptop' and 'thinkpad' into release

[karo-tx-linux.git] / Documentation / fb / vesafb.txt

diff --git a/Documentation/fb/vesafb.txt b/Documentation/fb/vesafb.txt
index 62db6758d1c1050db42b638ad4d42dc06809c68b..ee277dd204b0f575165b02f0dfc1fcb27c8d0bf8 100644 (file)
--- a/Documentation/fb/vesafb.txt
+++ b/Documentation/fb/vesafb.txt
@@ -146,10 +146,10 @@ pmipal    Use the protected mode interface for palette changes.
 
 mtrr:n setup memory type range registers for the vesafb framebuffer
        where n:
-             0 - disabled (equivalent to nomtrr)
+             0 - disabled (equivalent to nomtrr) (default)
              1 - uncachable
              2 - write-back
-             3 - write-combining (default)
+             3 - write-combining
              4 - write-through
 
        If you see the following in dmesg, choose the type that matches the