diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-13 03:28:45 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-13 03:28:45 -0400 |
| commit | 9343af084c7e8911897b0883042ee690cee3aaef (patch) | |
| tree | 6211a4bdc84690bec6530d27a3abb19f5e8bb8f3 /net/ipv4/raw.c | |
| parent | e182c77cc291456eed127b1472952ddb59a81a9d (diff) | |
| parent | 0d0fb0f9c5fddef4a10242fe3337f00f528a3099 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
lib/Kconfig.debug
Diffstat (limited to 'net/ipv4/raw.c')
| -rw-r--r-- | net/ipv4/raw.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index ce154b47f1da..cc6f097fbd5f 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c | |||
| @@ -60,7 +60,6 @@ | |||
| 60 | #include <net/net_namespace.h> | 60 | #include <net/net_namespace.h> |
| 61 | #include <net/dst.h> | 61 | #include <net/dst.h> |
| 62 | #include <net/sock.h> | 62 | #include <net/sock.h> |
| 63 | #include <linux/gfp.h> | ||
| 64 | #include <linux/ip.h> | 63 | #include <linux/ip.h> |
| 65 | #include <linux/net.h> | 64 | #include <linux/net.h> |
| 66 | #include <net/ip.h> | 65 | #include <net/ip.h> |