summaryrefslogtreecommitdiffstats
path: root/Documentation/m68k
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-08-08 12:37:17 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-08-08 12:37:17 +0000
commit9aa9eb41942b918f385ccabd2efdd6e7e4232165 (patch)
tree20bec7da036d31ec185dfc1dcc00753c7ac9b170 /Documentation/m68k
parent87075e049581f880f01eb0b41aa6ac807b299e35 (diff)
Merge with Linux 2.4.0-test6-pre1.
Diffstat (limited to 'Documentation/m68k')
-rw-r--r--Documentation/m68k/README.buddha6
-rw-r--r--Documentation/m68k/kernel-options.txt2
2 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/m68k/README.buddha b/Documentation/m68k/README.buddha
index d3b7bc73f..bf802ffc9 100644
--- a/Documentation/m68k/README.buddha
+++ b/Documentation/m68k/README.buddha
@@ -21,7 +21,7 @@ Rom-vector: $1000
The card should be a Z-II board, size 64K, not for freemem
list, Rom-Vektor is valid, no second Autoconfig-board on the
-same card, no space preferrence, supports "Shutup_forever".
+same card, no space preference, supports "Shutup_forever".
Setting the base address should be done in two steps, just
as the Amiga Kickstart does: The lower nibble of the 8-Bit
@@ -29,7 +29,7 @@ address is written to $4a, then the whole Byte is written to
$48, while it doesn't matter how often you're writing to $4a
as long as $48 is not touched. After $48 has been written,
the whole card disappears from $e8 and is mapped to the new
-addrress just written. Make shure $4a is written befor $48,
+address just written. Make shure $4a is written before $48,
otherwise your chance is only 1:16 to find the board :-).
The local memory-map is even active when mapped to $e8:
@@ -100,7 +100,7 @@ IRQ-lines of the IDE-ports by reading from the three (two
for Buddha-only) registers $f00, $f40 and $f80. This way
more than one I/O request can be handled and you can easily
determine what driver has to serve the INT2. Buddha and
-Catweasel expansion boards can issue an INT6. A seperate
+Catweasel expansion boards can issue an INT6. A separate
memory map is available for the I/O module and the sysop's
I/O module.
diff --git a/Documentation/m68k/kernel-options.txt b/Documentation/m68k/kernel-options.txt
index 5938cb8cf..e191baad8 100644
--- a/Documentation/m68k/kernel-options.txt
+++ b/Documentation/m68k/kernel-options.txt
@@ -482,7 +482,7 @@ the physical linelength differs from the visible length. With ProMST,
xres_virtual must be set to 2048. For ET4000, xres_virtual depends on the
initialisation of the video-card.
If you're missing a corresponding yres_virtual: the external part is legacy,
-therefore we don't support hardware-dependend functions like hardware-scroll,
+therefore we don't support hardware-dependent functions like hardware-scroll,
panning or blanking.
4.1.7) eclock: