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 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
arch
/
um
/
os-Linux
/
helper.c
diff --git
a/arch/um/os-Linux/helper.c
b/arch/um/os-Linux/helper.c
index
06d6ccf
..
b6b1096
100644
(file)
--- a/
arch/um/os-Linux/helper.c
+++ b/
arch/um/os-Linux/helper.c
@@
-8,7
+8,6
@@
#include <errno.h>
#include <sched.h>
#include <linux/limits.h>
-#include <linux/slab.h>
#include <sys/socket.h>
#include <sys/wait.h>
#include "kern_constants.h"