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 'linux-2.6' into for-linus
[pandora-kernel.git]
/
arch
/
sparc64
/
kernel
/
entry.S
diff --git
a/arch/sparc64/kernel/entry.S
b/arch/sparc64/kernel/entry.S
index
be85ce2
..
6f28bec
100644
(file)
--- a/
arch/sparc64/kernel/entry.S
+++ b/
arch/sparc64/kernel/entry.S
@@
-7,7
+7,6
@@
* Copyright (C) 1996,98,99 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
*/
* Copyright (C) 1996,98,99 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
*/
-#include <linux/config.h>
#include <linux/errno.h>
#include <asm/head.h>
#include <linux/errno.h>
#include <asm/head.h>
@@
-23,11
+22,10
@@
#include <asm/auxio.h>
#include <asm/sfafsr.h>
#include <asm/pil.h>
#include <asm/auxio.h>
#include <asm/sfafsr.h>
#include <asm/pil.h>
+#include <asm/unistd.h>
#define curptr g6
#define curptr g6
-#define NR_SYSCALLS 300 /* Each OS is different... */
-
.text
.align 32
.text
.align 32