diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-14 07:59:21 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-14 07:59:21 -0600 |
| commit | 9423a2e8dd362a271bfe194ec131062814557b95 (patch) | |
| tree | 6b10b2d69e5d81b6ff4cb2ba75693d8a65362d92 /pc-bios | |
| parent | da5361cc685c004d8bb4e7c5e7b3a52c7aca2c56 (diff) | |
| parent | 126c79133f77d1b0b7c3849899c6d5f83b2fd410 (diff) | |
Merge remote-tracking branch 'stefanha/trivial-patches-next' into staging
Diffstat (limited to 'pc-bios')
| -rw-r--r-- | pc-bios/keymaps/is | 2 | ||||
| -rw-r--r-- | pc-bios/ohw.diff | 2 | ||||
| -rw-r--r-- | pc-bios/optionrom/multiboot.S | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pc-bios/keymaps/is b/pc-bios/keymaps/is index 21dc1fd3ca..935ac1da7a 100644 --- a/pc-bios/keymaps/is +++ b/pc-bios/keymaps/is @@ -1,4 +1,4 @@ -# 2004-03-16 Halldór Guðmundsson and Morten Lange +# 2004-03-16 Halldór Guðmundsson and Morten Lange # Keyboard definition file for the Icelandic keyboard # to be used in rdesktop 1.3.x ( See rdesktop.org) # generated from XKB map de, and changed manually diff --git a/pc-bios/ohw.diff b/pc-bios/ohw.diff index 4fb542274d..c6b6623f2f 100644 --- a/pc-bios/ohw.diff +++ b/pc-bios/ohw.diff @@ -1065,7 +1065,7 @@ diff -wruN --exclude '*~' --exclude '*.o' --exclude '*.bin' --exclude '*.out' -- + tab, 4 * sizeof(uint32_t)); + } +#if 0 - /* escc is usefull to get MacOS X debug messages */ + /* escc is useful to get MacOS X debug messages */ { OF_regprop_t regs[8]; @@ -2645,85 +2843,12 @@ diff --git a/pc-bios/optionrom/multiboot.S b/pc-bios/optionrom/multiboot.S index cc5ca1b7d1..f08222a3c6 100644 --- a/pc-bios/optionrom/multiboot.S +++ b/pc-bios/optionrom/multiboot.S @@ -50,7 +50,7 @@ run_multiboot: shr $0x4, %ecx mov %cx, %gs - /* now push the indirect jump decriptor there */ + /* now push the indirect jump descriptor there */ mov (prot_jump), %ebx add %eax, %ebx movl %ebx, %gs:GS_PROT_JUMP |