git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'clk' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux...
[pandora-kernel.git]
/
arch
/
x86
/
boot
/
header.S
diff --git
a/arch/x86/boot/header.S
b/arch/x86/boot/header.S
index
93e689f
..
bdb4d45
100644
(file)
--- a/
arch/x86/boot/header.S
+++ b/
arch/x86/boot/header.S
@@
-129,7
+129,7
@@
start_sys_seg: .word SYSSEG # obsolete and meaningless, but just
type_of_loader: .byte 0 # 0 means ancient bootloader, newer
# bootloaders know to change this.
- # See Documentation/
i3
86/boot.txt for
+ # See Documentation/
x
86/boot.txt for
# assigned ids
# flags, unused bits must be zero (RFU) bit within loadflags