summaryrefslogtreecommitdiffstats
path: root/Documentation/mtrr.txt
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-10-09 00:00:47 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-10-09 00:00:47 +0000
commitd6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch)
treee2be02f33984c48ec019c654051d27964e42c441 /Documentation/mtrr.txt
parent609d1e803baf519487233b765eb487f9ec227a18 (diff)
Merge with 2.3.19.
Diffstat (limited to 'Documentation/mtrr.txt')
-rw-r--r--Documentation/mtrr.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/mtrr.txt b/Documentation/mtrr.txt
index f047b7a28..941da7e91 100644
--- a/Documentation/mtrr.txt
+++ b/Documentation/mtrr.txt
@@ -52,7 +52,7 @@ reg00: base=0x00000000 ( 0MB), size= 128MB: write-back, count=1
reg01: base=0x08000000 ( 128MB), size= 64MB: write-back, count=1
reg02: base=0xf8000000 (3968MB), size= 4MB: write-combining, count=1
-This is for videoram at base address 0xf8000000 and size 4 MBytes. To
+This is for video RAM at base address 0xf8000000 and size 4 megabytes. To
find out your base address, you need to look at the output of your X
server, which tells you where the linear framebuffer address is. A
typical line that you may get is:
@@ -68,7 +68,7 @@ know?), the following line will tell you:
(--) S3: videoram: 4096k
-That's 4 MBytes, which is 0x400000 bytes (in hexadecimal).
+That's 4 megabytes, which is 0x400000 bytes (in hexadecimal).
A patch is being written for XFree86 which will make this automatic:
in other words the X server will manipulate /proc/mtrr using the
ioctl() interface, so users won't have to do anything. If you use a