[PATCH] vesafb: Disable mtrr as the default

vesafb occassionally gets the size wrong when setting the mtrr.  When X or DRI
attempts to set the mtrr, it will fail due to range overlap significantly
affecting their performance.  Disable mtrr and let the user explicitly enable
it with the mtrr:n option.

Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/Documentation/fb/vesafb.txt b/Documentation/fb/vesafb.txt
index 62db6758d1c1..ee277dd204b0 100644
--- 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