diff options
author | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
commit | 4a1032faac94ebbf647460ae3e06fc21146eb280 (patch) | |
tree | 7f31b97beb0406faa1523e619289ad0ab07c9787 /net/rxrpc/ar-transport.c | |
parent | ae4e8d63b5619d4d95f1d2bfa2b836caa6e62d06 (diff) | |
parent | 0eddb519b9127c73d53db4bf3ec1d45b13f844d1 (diff) |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'net/rxrpc/ar-transport.c')
-rw-r--r-- | net/rxrpc/ar-transport.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/rxrpc/ar-transport.c b/net/rxrpc/ar-transport.c index 0936e1acc30e..5e0226fe587e 100644 --- a/net/rxrpc/ar-transport.c +++ b/net/rxrpc/ar-transport.c | |||
@@ -12,6 +12,7 @@ | |||
12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
13 | #include <linux/net.h> | 13 | #include <linux/net.h> |
14 | #include <linux/skbuff.h> | 14 | #include <linux/skbuff.h> |
15 | #include <linux/slab.h> | ||
15 | #include <net/sock.h> | 16 | #include <net/sock.h> |
16 | #include <net/af_rxrpc.h> | 17 | #include <net/af_rxrpc.h> |
17 | #include "ar-internal.h" | 18 | #include "ar-internal.h" |