diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 19:27:41 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 19:27:41 -0500 |
| commit | d347da0deffa1d8f88f0d270eab040e4707c9916 (patch) | |
| tree | e0911f2ef4d36a7b44f7a5379feabebbd37dcfc4 /net/ipv4/ipconfig.c | |
| parent | c6c88bbde4d8b2ffe9886b7130b2e23781d424e5 (diff) | |
| parent | 74cb8798222bb7d1aecb0acb91e6eeedf5feb948 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv4/ipconfig.c')
| -rw-r--r-- | net/ipv4/ipconfig.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c index e8674baaa8d9..bb3613ec448c 100644 --- a/net/ipv4/ipconfig.c +++ b/net/ipv4/ipconfig.c | |||
| @@ -42,6 +42,7 @@ | |||
| 42 | #include <linux/in.h> | 42 | #include <linux/in.h> |
| 43 | #include <linux/if.h> | 43 | #include <linux/if.h> |
| 44 | #include <linux/inet.h> | 44 | #include <linux/inet.h> |
| 45 | #include <linux/inetdevice.h> | ||
| 45 | #include <linux/netdevice.h> | 46 | #include <linux/netdevice.h> |
| 46 | #include <linux/if_arp.h> | 47 | #include <linux/if_arp.h> |
| 47 | #include <linux/skbuff.h> | 48 | #include <linux/skbuff.h> |
| @@ -58,6 +59,7 @@ | |||
| 58 | #include <net/arp.h> | 59 | #include <net/arp.h> |
| 59 | #include <net/ip.h> | 60 | #include <net/ip.h> |
| 60 | #include <net/ipconfig.h> | 61 | #include <net/ipconfig.h> |
| 62 | #include <net/route.h> | ||
| 61 | 63 | ||
| 62 | #include <asm/uaccess.h> | 64 | #include <asm/uaccess.h> |
| 63 | #include <net/checksum.h> | 65 | #include <net/checksum.h> |