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 'drm-ttm-unmappable' into drm-core-next
[pandora-kernel.git]
/
net
/
tipc
/
socket.c
diff --git
a/net/tipc/socket.c
b/net/tipc/socket.c
index
4b235fc
..
cfb20b8
100644
(file)
--- a/
net/tipc/socket.c
+++ b/
net/tipc/socket.c
@@
-40,9
+40,9
@@
#include <linux/socket.h>
#include <linux/errno.h>
#include <linux/mm.h>
-#include <linux/slab.h>
#include <linux/poll.h>
#include <linux/fcntl.h>
+#include <linux/gfp.h>
#include <asm/string.h>
#include <asm/atomic.h>
#include <net/sock.h>