diff options
| author | Thomas Huth <thuth@linux.vnet.ibm.com> | 2015-01-30 15:47:32 +0100 |
|---|---|---|
| committer | Alexey Kardashevskiy <aik@ozlabs.ru> | 2015-03-12 18:25:35 +1100 |
| commit | 21d5f489c2e311227f2a72cc7149066714398ae0 (patch) | |
| tree | f0dd6f35e5e49c33240c244258ce932fb62d4d56 /other-licence | |
| parent | 4d8debd01d89010b590a5fed9610b2b81e05a343 (diff) | |
| download | SLOF-21d5f489c2e311227f2a72cc7149066714398ae0.zip SLOF-21d5f489c2e311227f2a72cc7149066714398ae0.tar.gz SLOF-21d5f489c2e311227f2a72cc7149066714398ae0.tar.bz2 | |
Fix the x86emu patch file
One of the hunks in the patch file was bad, so replace it with a proper hunk.
Signed-off-by: Thomas Huth <thuth@linux.vnet.ibm.com>
Signed-off-by: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
Diffstat (limited to 'other-licence')
| -rw-r--r-- | other-licence/x86emu/x86emu_changes.diff | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/other-licence/x86emu/x86emu_changes.diff b/other-licence/x86emu/x86emu_changes.diff index b6f931f..52b971a 100644 --- a/other-licence/x86emu/x86emu_changes.diff +++ b/other-licence/x86emu/x86emu_changes.diff @@ -852,13 +852,14 @@ retrieving revision 1.3 diff -u -u -r1.1 -r1.3 --- include/x86emu/x86emu.h 7 Sep 2007 10:01:21 -0000 1.1 +++ include/x86emu/x86emu.h 19 Oct 2007 08:42:15 -0000 1.3 -@@ -42,6 +42,6 @@ - #ifndef __X86EMU_X86EMU_H - #define __X86EMU_X86EMU_H +@@ -47,6 +47,7 @@ + #include <console.h> + #define printk(x...) printk(BIOS_DEBUG, x) + #else ++#include <stdio.h> + #define printk printf + #endif - #ifdef SCITECH - #include "scitech.h" - #define X86API _ASMAPI @@ -189,6 +181,8 @@ #define DEBUG_TRACECALL_REGS_F 0x004000 #define DEBUG_DECODE_NOPRINT_F 0x008000 |