diff options
author | David S. Miller <davem@davemloft.net> | 2010-04-13 09:28:45 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-13 09:28:45 +0200 |
commit | 9343af084c7e8911897b0883042ee690cee3aaef (patch) | |
tree | 6211a4bdc84690bec6530d27a3abb19f5e8bb8f3 /net/rxrpc/ar-ack.c | |
parent | sparc64: Fix memory leak in pci_register_iommu_region(). (diff) | |
parent | Linux 2.6.34-rc4 (diff) | |
download | linux-9343af084c7e8911897b0883042ee690cee3aaef.tar.xz linux-9343af084c7e8911897b0883042ee690cee3aaef.zip |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
lib/Kconfig.debug
Diffstat (limited to 'net/rxrpc/ar-ack.c')
-rw-r--r-- | net/rxrpc/ar-ack.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/rxrpc/ar-ack.c b/net/rxrpc/ar-ack.c index b4a220977031..2714da167fb8 100644 --- a/net/rxrpc/ar-ack.c +++ b/net/rxrpc/ar-ack.c @@ -13,6 +13,7 @@ #include <linux/circ_buf.h> #include <linux/net.h> #include <linux/skbuff.h> +#include <linux/slab.h> #include <linux/udp.h> #include <net/sock.h> #include <net/af_rxrpc.h> |