diff options
| author | David S. Miller | 2010-04-11 11:44:30 +0200 |
|---|---|---|
| committer | David S. Miller | 2010-04-11 11:44:30 +0200 |
| commit | 4a1032faac94ebbf647460ae3e06fc21146eb280 (patch) | |
| tree | 7f31b97beb0406faa1523e619289ad0ab07c9787 /net/core/iovec.c | |
| parent | Revert "tcp: Set CHECKSUM_UNNECESSARY in tcp_init_nondata_skb" (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol... (diff) | |
| download | kernel-qcow2-linux-4a1032faac94ebbf647460ae3e06fc21146eb280.tar.gz kernel-qcow2-linux-4a1032faac94ebbf647460ae3e06fc21146eb280.tar.xz kernel-qcow2-linux-4a1032faac94ebbf647460ae3e06fc21146eb280.zip | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'net/core/iovec.c')
| -rw-r--r-- | net/core/iovec.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/core/iovec.c b/net/core/iovec.c index 16ad45d4882b..1e7f4e91a935 100644 --- a/net/core/iovec.c +++ b/net/core/iovec.c @@ -20,7 +20,6 @@ #include <linux/module.h> #include <linux/kernel.h> #include <linux/mm.h> -#include <linux/slab.h> #include <linux/net.h> #include <linux/in6.h> #include <asm/uaccess.h> |