diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-07-15 17:47:46 +1000 |
|---|---|---|
| committer | Nikunj A Dadhania <nikunj@linux.vnet.ibm.com> | 2014-10-29 16:17:05 +0530 |
| commit | 4ca13ddf7f3fb12cf6ba22255ea07ee3e4c7e9b2 (patch) | |
| tree | d2464bfb313b05003d486eb47bb002d907c3e933 /other-licence | |
| parent | b95d82520211c9f403594ff174de47db9eef8562 (diff) | |
| download | SLOF-4ca13ddf7f3fb12cf6ba22255ea07ee3e4c7e9b2.zip SLOF-4ca13ddf7f3fb12cf6ba22255ea07ee3e4c7e9b2.tar.gz SLOF-4ca13ddf7f3fb12cf6ba22255ea07ee3e4c7e9b2.tar.bz2 | |
net-snk: Remove printk() in favor of printf()
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'other-licence')
| -rw-r--r-- | other-licence/x86emu/x86emu_changes.diff | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/other-licence/x86emu/x86emu_changes.diff b/other-licence/x86emu/x86emu_changes.diff index aa1a359..b6f931f 100644 --- a/other-licence/x86emu/x86emu_changes.diff +++ b/other-licence/x86emu/x86emu_changes.diff @@ -844,15 +844,6 @@ diff -u -u -r1.1 -r1.4 u16 saved_ip; u16 saved_cs; int enc_pos; -@@ -366,7 +370,7 @@ - - /* Function to log information at runtime */ - --//void printk(const char *fmt, ...); -+void printk(const char *fmt, ...); - - #ifdef __cplusplus - } /* End of "C" linkage for C++ */ Index: include/x86emu/x86emu.h =================================================================== RCS file: /cvs/osdf/cvs/host/other-licence/x86emu/include/x86emu/x86emu.h,v @@ -861,18 +852,10 @@ 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,14 +42,6 @@ +@@ -42,6 +42,6 @@ #ifndef __X86EMU_X86EMU_H #define __X86EMU_X86EMU_H --/* FIXME: undefine printk for the moment */ --#ifdef LINUXBIOS_VERSION --#include <console.h> --#define printk(x...) printk(BIOS_DEBUG, x) --#else --#define printk printf --#endif -- #ifdef SCITECH #include "scitech.h" #define X86API _ASMAPI |