diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-06-27 09:31:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-06-27 09:31:13 -0700 |
| commit | 4c0e1e4bc57418bbf9af19b7b6334441f28a4dc1 (patch) | |
| tree | 80fe1a95f149e3b29ba178b86d23370ea637de04 /include | |
| parent | cad6dc2f7b297eb153b130f63194060f6df2a160 (diff) | |
| parent | 6fffe657f3ea61725d9e8c4b7b4c3871e4c59b8c (diff) | |
Merge master.kernel.org:/home/davem/BK/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/ip.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/net/ip.h b/include/net/ip.h index d36a3b230819..7b6ea4334bf1 100644 --- a/include/net/ip.h +++ b/include/net/ip.h @@ -32,10 +32,7 @@ #include <linux/in_route.h> #include <net/route.h> #include <net/arp.h> - -#ifndef _SNMP_H #include <net/snmp.h> -#endif struct sock; |