diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-08-30 14:33:26 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-08-30 14:33:26 -0400 |
| commit | 2016ef789a9ded2e169ad1c028ae3deb5302571f (patch) | |
| tree | 601359f15b42d4d9868b4eadfe909a7bef6435c5 /net/ipv4/protocol.c | |
| parent | 7f57356b70dda014ef269135942426e4a852023e (diff) | |
| parent | 6b39374a27eb4be7e9d82145ae270ba02ea90dc8 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'net/ipv4/protocol.c')
| -rw-r--r-- | net/ipv4/protocol.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv4/protocol.c b/net/ipv4/protocol.c index 0db405a869f2..291831e792af 100644 --- a/net/ipv4/protocol.c +++ b/net/ipv4/protocol.c | |||
| @@ -40,7 +40,6 @@ | |||
| 40 | #include <linux/timer.h> | 40 | #include <linux/timer.h> |
| 41 | #include <net/ip.h> | 41 | #include <net/ip.h> |
| 42 | #include <net/protocol.h> | 42 | #include <net/protocol.h> |
| 43 | #include <net/tcp.h> | ||
| 44 | #include <linux/skbuff.h> | 43 | #include <linux/skbuff.h> |
| 45 | #include <net/sock.h> | 44 | #include <net/sock.h> |
| 46 | #include <net/icmp.h> | 45 | #include <net/icmp.h> |