summaryrefslogtreecommitdiffstats
path: root/Documentation/ia64
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/ia64
parent87075e049581f880f01eb0b41aa6ac807b299e35 (diff)
Merge with Linux 2.4.0-test6-pre1.
Diffstat (limited to 'Documentation/ia64')
-rw-r--r--Documentation/ia64/README4
-rw-r--r--Documentation/ia64/efirtc.txt2
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/ia64/README b/Documentation/ia64/README
index 5bb41f96f..54b591caa 100644
--- a/Documentation/ia64/README
+++ b/Documentation/ia64/README
@@ -57,8 +57,8 @@ IA-64 SPECIFICS
table and only if that fails fall back on walking the page table
tree.
- o Discontigous large memory support; memory above 4GB will be
- discontigous since the 4GB-64MB is reserved for firmware and I/O
+ o Discontinuous large memory support; memory above 4GB will be
+ discontinuous since the 4GB-64MB is reserved for firmware and I/O
space.
o Correct mapping for PAL runtime code; PAL code needs to be
diff --git a/Documentation/ia64/efirtc.txt b/Documentation/ia64/efirtc.txt
index b0c62765c..87f66bbaf 100644
--- a/Documentation/ia64/efirtc.txt
+++ b/Documentation/ia64/efirtc.txt
@@ -36,7 +36,7 @@ The Epoch is January 1st 1998. For backward compatibility reasons we don't
expose this new way of representing time. Instead we use something very
similar to the struct tm, i.e. struct rtc_time, as used by hwclock.
One of the reasons for doing it this way is to allow for EFI to still evolve
-without necessarily impatcing any of the user applications. The decoupling
+without necessarily impacting any of the user applications. The decoupling
enables flexibility and permits writing wrapper code is ncase things change.
The driver exposes two interfaces, one via the device file and a set of ioctl()s.