diff options
-rw-r--r-- | Documentation/fb/vesafb.txt | 4 | ||||
-rw-r--r-- | drivers/video/vesafb.c | 2 |
2 files changed, 3 insertions, 3 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. | |||
146 | 146 | ||
147 | mtrr:n setup memory type range registers for the vesafb framebuffer | 147 | mtrr:n setup memory type range registers for the vesafb framebuffer |
148 | where n: | 148 | where n: |
149 | 0 - disabled (equivalent to nomtrr) | 149 | 0 - disabled (equivalent to nomtrr) (default) |
150 | 1 - uncachable | 150 | 1 - uncachable |
151 | 2 - write-back | 151 | 2 - write-back |
152 | 3 - write-combining (default) | 152 | 3 - write-combining |
153 | 4 - write-through | 153 | 4 - write-through |
154 | 154 | ||
155 | If you see the following in dmesg, choose the type that matches the | 155 | If you see the following in dmesg, choose the type that matches the |
diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c index 67e215443953..e25eae1a78c1 100644 --- a/drivers/video/vesafb.c +++ b/drivers/video/vesafb.c | |||
@@ -48,7 +48,7 @@ static struct fb_fix_screeninfo vesafb_fix __initdata = { | |||
48 | }; | 48 | }; |
49 | 49 | ||
50 | static int inverse = 0; | 50 | static int inverse = 0; |
51 | static int mtrr = 3; /* default to write-combining */ | 51 | static int mtrr = 0; /* disable mtrr */ |
52 | static int vram_remap __initdata = 0; /* Set amount of memory to be used */ | 52 | static int vram_remap __initdata = 0; /* Set amount of memory to be used */ |
53 | static int vram_total __initdata = 0; /* Set total amount of memory */ | 53 | static int vram_total __initdata = 0; /* Set total amount of memory */ |
54 | static int pmi_setpal = 0; /* pmi for palette changes ??? */ | 54 | static int pmi_setpal = 0; /* pmi for palette changes ??? */ |