diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-03 03:15:35 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-03 03:15:35 -0500 |
| commit | b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15 (patch) | |
| tree | 99e5b423473097756353d038f922b2623f3edd2a /include/linux/ipv6.h | |
| parent | 1bded710a574f20d41bc9e7fb531301db282d623 (diff) | |
| parent | fb53fde9762432d091dac209bdf4f3f850117c55 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/Kconfig
Diffstat (limited to 'include/linux/ipv6.h')
| -rw-r--r-- | include/linux/ipv6.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index 0b816cae533e..476d9464ac82 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | #ifndef _IPV6_H | 1 | #ifndef _IPV6_H |
| 2 | #define _IPV6_H | 2 | #define _IPV6_H |
| 3 | 3 | ||
| 4 | #include <linux/types.h> | ||
| 4 | #include <linux/in6.h> | 5 | #include <linux/in6.h> |
| 5 | #include <asm/byteorder.h> | 6 | #include <asm/byteorder.h> |
| 6 | 7 | ||