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 'for-next' of git://www.jni.nu/cris into cris_merge
[pandora-kernel.git]
/
arch
/
um
/
os-Linux
/
skas
/
mem.c
diff --git
a/arch/um/os-Linux/skas/mem.c
b/arch/um/os-Linux/skas/mem.c
index
484e68f
..
d261f17
100644
(file)
--- a/
arch/um/os-Linux/skas/mem.c
+++ b/
arch/um/os-Linux/skas/mem.c
@@
-20,7
+20,6
@@
#include "user.h"
#include "sysdep/ptrace.h"
#include "sysdep/stub.h"
-#include "uml-config.h"
extern unsigned long batch_syscall_stub, __syscall_stub_start;