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 /include/net/x25.h | |
| 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 'include/net/x25.h')
| -rw-r--r-- | include/net/x25.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/x25.h b/include/net/x25.h index 33f67fb78586..468551ea4f1d 100644 --- a/include/net/x25.h +++ b/include/net/x25.h @@ -10,6 +10,7 @@ #ifndef _X25_H #define _X25_H #include <linux/x25.h> +#include <linux/slab.h> #include <net/sock.h> #define X25_ADDR_LEN 16 |