diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-31 15:51:37 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-31 15:51:37 -0700 |
commit | 8ddf83fed6c283dd941ca76ae715eb268ee8c04e (patch) | |
tree | 309628fccc4ec213afd8ebd28181703050bb046a /arch/i386/boot/header.S | |
parent | 0d6caa1795090bd22ede96b84daa4600b63eee37 (diff) | |
parent | ff659d13ed91dd0b237064aba91a5259f827aeb3 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup:
[x86 setup] EDD: Fix the computation of the MBR sector buffer
[x86 setup] Newline after setup signature failure message
x86 boot code comments typos
Diffstat (limited to 'arch/i386/boot/header.S')
-rw-r--r-- | arch/i386/boot/header.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/boot/header.S b/arch/i386/boot/header.S index 6b9923fb6ea..7f4a2c53bd7 100644 --- a/arch/i386/boot/header.S +++ b/arch/i386/boot/header.S @@ -225,7 +225,7 @@ start_of_setup: int $0x13 #endif -# We will have entired with %cs = %ds+0x20, normalize %cs so +# We will have entered with %cs = %ds+0x20, normalize %cs so # it is on par with the other segments. pushw %ds pushw $setup2 @@ -280,4 +280,4 @@ die: .section ".initdata", "a" setup_corrupt: .byte 7 - .string "No setup signature found..." + .string "No setup signature found...\n" |