aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin2013-01-31 22:23:49 -0600
committerH. Peter Anvin2013-01-31 22:23:49 -0600
commit972f7c832229781f09f03284cde484ccdb44d3ee (patch)
tree02c92edb7f257e28a961d3bf3502067078dc603a
parentb5831174f9d3f12a492deda6374ca96f87b694f8 (diff)
downloadkernel-omap-972f7c832229781f09f03284cde484ccdb44d3ee.tar.gz
kernel-omap-972f7c832229781f09f03284cde484ccdb44d3ee.tar.xz
kernel-omap-972f7c832229781f09f03284cde484ccdb44d3ee.zip
x86, doc: Boot protocol 2.12 is in 3.8
The boot protocol 2.12 changes were pulled for 3.8, so update the documentation accordingly. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
-rw-r--r--Documentation/x86/boot.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/x86/boot.txt b/Documentation/x86/boot.txt
index 3edb4c2887a1..e540fd67f767 100644
--- a/Documentation/x86/boot.txt
+++ b/Documentation/x86/boot.txt
@@ -57,7 +57,7 @@ Protocol 2.10: (Kernel 2.6.31) Added a protocol for relaxed alignment
57Protocol 2.11: (Kernel 3.6) Added a field for offset of EFI handover 57Protocol 2.11: (Kernel 3.6) Added a field for offset of EFI handover
58 protocol entry point. 58 protocol entry point.
59 59
60Protocol 2.12: (Kernel 3.9) Added the xloadflags field and extension fields 60Protocol 2.12: (Kernel 3.8) Added the xloadflags field and extension fields
61 to struct boot_params for for loading bzImage and ramdisk 61 to struct boot_params for for loading bzImage and ramdisk
62 above 4G in 64bit. 62 above 4G in 64bit.
63 63