diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-21 10:00:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-21 10:00:57 -0700 |
| commit | 6044ab324ce4c180bce17aa9be00157c611d7d48 (patch) | |
| tree | 8093f40d39f6e3ed818a7b5388fafced4639eb02 /include/linux | |
| parent | d07b3c25327c5ae3792d0ed0c135dee4727200a1 (diff) | |
| parent | 9093bbb2d96d0184f037cea9b4e952a44ebe7c32 (diff) | |
| download | op-kernel-dev-6044ab324ce4c180bce17aa9be00157c611d7d48.zip op-kernel-dev-6044ab324ce4c180bce17aa9be00157c611d7d48.tar.gz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[NET]: Fix race condition about network device name allocation.
[IPV4]: icmp: fix crash with sysctl_icmp_errors_use_inbound_ifaddr
[NETFILTER]: nf_conntrack_ipv4: fix incorrect #ifdef config name
[NETFILTER]: nf_conntrack: fix use-after-free in helper destroy callback invocation
[IPSEC] pfkey: Load specific algorithm in pfkey_add rather than all
[TCP] FRTO: Prevent state inconsistency in corner cases
[TCP] FRTO: Add missing ECN CWR sending to one of the responses
[NET]: Fix net/core/skbuff.c gcc-3.2.3 compilation error
[RFKILL]: Fix check for correct rfkill allocation
[IPV6]: Add ip6_tunnel.h to headers_install
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index bcd01f2..e101315 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild @@ -239,6 +239,7 @@ unifdef-y += ipc.h unifdef-y += ipmi.h unifdef-y += ipv6.h unifdef-y += ipv6_route.h +unifdef-y += ip6_tunnel.h unifdef-y += isdn.h unifdef-y += isdnif.h unifdef-y += isdn_divertif.h |
