aboutsummaryrefslogtreecommitdiff
path: root/Documentation/kernel-parameters.txt
diff options
context:
space:
mode:
authorHorms <horms@verge.net.au>2006-04-01 01:36:09 +0200
committerAdrian Bunk <bunk@stusta.de>2006-04-01 01:36:09 +0200
commitabe37e5a13c4055bdf8ea1d2e781d757285e1908 (patch)
tree19e5347290d225294c10e5e8b9e3286df6a4eade /Documentation/kernel-parameters.txt
parent2e150f6e1a0401ff6af7b3f6518139fb092f3dd3 (diff)
Documentation: Reorder documentation of nomca and nomce
My patch to add brief documentation of the nomca boot parameter added it out of alphabetical order. Signed-Off-By: Horms <horms@verge.net.au> Signed-off-by: Adrian Bunk <bunk@stusta.de>
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r--Documentation/kernel-parameters.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index f8cb55c30b0..f5863b04a07 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1046,10 +1046,10 @@ running once the system is up.
noltlbs [PPC] Do not use large page/tlb entries for kernel
lowmem mapping on PPC40x.
- nomce [IA-32] Machine Check Exception
-
nomca [IA-64] Disable machine check abort handling
+ nomce [IA-32] Machine Check Exception
+
noresidual [PPC] Don't use residual data on PReP machines.
noresume [SWSUSP] Disables resume and restores original swap