Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / Documentation / x86 / boot.txt

diff --git a/Documentation/x86/boot.txt b/Documentation/x86/boot.txt
index 83c0033ee9e01d26866494b58115a1da9b2c429a..fcdc62b3c3d8d8d1b826c04ce70a3bf9ea0b2a9b 100644 (file)
--- a/Documentation/x86/boot.txt
+++ b/Documentation/x86/boot.txt
@@ -349,7 +349,7 @@ Protocol:   2.00+
        3  SYSLINUX
        4  EtherBoot
        5  ELILO
        3  SYSLINUX
        4  EtherBoot
        5  ELILO

-       7  GRuB
+       7  GRUB

        8  U-BOOT
        9  Xen
        A  Gujin
        8  U-BOOT
        9  Xen
        A  Gujin


@@ -537,8 +537,8 @@ Type:               read
 Offset/size:   0x248/4
 Protocol:      2.08+
 
 Offset/size:   0x248/4
 Protocol:      2.08+
 

-  If non-zero then this field contains the offset from the end of the
-  real-mode code to the payload.
+  If non-zero then this field contains the offset from the beginning
+  of the protected-mode code to the payload.

 
   The payload may be compressed. The format of both the compressed and
   uncompressed data should be determined using the standard magic
 
   The payload may be compressed. The format of both the compressed and
   uncompressed data should be determined using the standard magic