projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'ht-delete-2.6.35' into release
[linux-drm-fsl-dcu.git]
/
net
/
tipc
/
eth_media.c
diff --git
a/net/tipc/eth_media.c
b/net/tipc/eth_media.c
index 524ba5696d4d6530c1cf7cea80832cb8158cfaa9..6230d16020c49917f5f28e06b514d379f698205d 100644
(file)
--- a/
net/tipc/eth_media.c
+++ b/
net/tipc/eth_media.c
@@
-38,6
+38,7
@@
#include <net/tipc/tipc_bearer.h>
#include <net/tipc/tipc_msg.h>
#include <linux/netdevice.h>
+#include <linux/slab.h>
#include <net/net_namespace.h>
#define MAX_ETH_BEARERS 2