git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
kernel
/
linux32.c
diff --git
a/arch/mips/kernel/linux32.c
b/arch/mips/kernel/linux32.c
index a39d0597a37583df6e24d0e09f6ce63f7a96617a..c2dab140dc98fb1588259063699c7ba09b6f8ed7 100644
(file)
--- a/
arch/mips/kernel/linux32.c
+++ b/
arch/mips/kernel/linux32.c
@@
-15,7
+15,6
@@
#include <linux/time.h>
#include <linux/times.h>
#include <linux/poll.h>
#include <linux/time.h>
#include <linux/times.h>
#include <linux/poll.h>
-#include <linux/slab.h>
#include <linux/skbuff.h>
#include <linux/filter.h>
#include <linux/shm.h>
#include <linux/skbuff.h>
#include <linux/filter.h>
#include <linux/shm.h>
@@
-34,6
+33,7
@@
#include <linux/compat.h>
#include <linux/vfs.h>
#include <linux/ipc.h>
#include <linux/compat.h>
#include <linux/vfs.h>
#include <linux/ipc.h>
+#include <linux/slab.h>
#include <net/sock.h>
#include <net/scm.h>
#include <net/sock.h>
#include <net/scm.h>