aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorKyle McMartin <kyle@redhat.com>2009-02-19 16:48:14 -0500
committerH. Peter Anvin <hpa@linux.intel.com>2009-02-23 18:11:37 -0500
commit954a8b8162ecab1d5ddf6c5b993b2d4da3fcaef7 (patch)
treec2758e3b8d76602182900ed5bde3fc47f18f5915 /Documentation
parent20f4d6c3a2a23c5d7d9cc7f42fbb943ca7a03d1f (diff)
x86, doc: fix references to Documentation/x86/i386/boot.txt
Impact: Documentation fix The amazing dancing boot.txt file has jumped places again. It should never have been in Documentation/x86/i386, since it never was 32-bit-specific, but it unfortunately ended up there for a while. Signed-off-by: Kyle McMartin <kyle@redhat.com> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'Documentation')
-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 319785b6dcb1..f6d5d5b9b2b1 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -114,7 +114,7 @@ In addition, the following text indicates that the option:
114Parameters denoted with BOOT are actually interpreted by the boot 114Parameters denoted with BOOT are actually interpreted by the boot
115loader, and have no meaning to the kernel directly. 115loader, and have no meaning to the kernel directly.
116Do not modify the syntax of boot loader parameters without extreme 116Do not modify the syntax of boot loader parameters without extreme
117need or coordination with <Documentation/x86/i386/boot.txt>. 117need or coordination with <Documentation/x86/boot.txt>.
118 118
119There are also arch-specific kernel-parameters not documented here. 119There are also arch-specific kernel-parameters not documented here.
120See for example <Documentation/x86/x86_64/boot-options.txt>. 120See for example <Documentation/x86/x86_64/boot-options.txt>.
@@ -2449,7 +2449,7 @@ and is between 256 and 4096 characters. It is defined in the file
2449 See Documentation/fb/modedb.txt. 2449 See Documentation/fb/modedb.txt.
2450 2450
2451 vga= [BOOT,X86-32] Select a particular video mode 2451 vga= [BOOT,X86-32] Select a particular video mode
2452 See Documentation/x86/i386/boot.txt and 2452 See Documentation/x86/boot.txt and
2453 Documentation/svga.txt. 2453 Documentation/svga.txt.
2454 Use vga=ask for menu. 2454 Use vga=ask for menu.
2455 This is actually a boot loader parameter; the value is 2455 This is actually a boot loader parameter; the value is