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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
[pandora-kernel.git]
/
net
/
tipc
/
socket.c
diff --git
a/net/tipc/socket.c
b/net/tipc/socket.c
index
3388373
..
adb2eff
100644
(file)
--- a/
net/tipc/socket.c
+++ b/
net/tipc/socket.c
@@
-36,9
+36,6
@@
#include <net/sock.h>
-#include <linux/tipc.h>
-#include <linux/tipc_config.h>
-
#include "core.h"
#include "port.h"