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 'x86-kbuild-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
sparc
/
prom
/
printf.c
diff --git
a/arch/sparc/prom/printf.c
b/arch/sparc/prom/printf.c
index
660943e
..
ca86926
100644
(file)
--- a/
arch/sparc/prom/printf.c
+++ b/
arch/sparc/prom/printf.c
@@
-14,14
+14,14
@@
*/
#include <linux/kernel.h>
*/
#include <linux/kernel.h>
+#include <linux/compiler.h>
#include <asm/openprom.h>
#include <asm/oplib.h>
static char ppbuf[1024];
#include <asm/openprom.h>
#include <asm/oplib.h>
static char ppbuf[1024];
-void
-prom_write(const char *buf, unsigned int n)
+void notrace prom_write(const char *buf, unsigned int n)
{
char ch;
{
char ch;
@@
-33,8
+33,7
@@
prom_write(const char *buf, unsigned int n)
}
}
}
}
-void
-prom_printf(const char *fmt, ...)
+void notrace prom_printf(const char *fmt, ...)
{
va_list args;
int i;
{
va_list args;
int i;