diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-10 17:26:00 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-10 17:26:00 -0500 |
| commit | 33175d84ee3fa29991adb80513683e010769e807 (patch) | |
| tree | 3731f61cf82451b6892cf1368701e57e35d92908 /net/ipv6/ip6_tunnel.c | |
| parent | c5908939b2738bafe1b309bc2465cb9f2e6184c5 (diff) | |
| parent | 6dfbd87a20a737641ef228230c77f4262434fa24 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bnx2x/bnx2x_cmn.c
Diffstat (limited to 'net/ipv6/ip6_tunnel.c')
| -rw-r--r-- | net/ipv6/ip6_tunnel.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 02730ef26b0f..ea8d5e8128a9 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c | |||
| @@ -57,6 +57,7 @@ | |||
| 57 | MODULE_AUTHOR("Ville Nuorvala"); | 57 | MODULE_AUTHOR("Ville Nuorvala"); |
| 58 | MODULE_DESCRIPTION("IPv6 tunneling device"); | 58 | MODULE_DESCRIPTION("IPv6 tunneling device"); |
| 59 | MODULE_LICENSE("GPL"); | 59 | MODULE_LICENSE("GPL"); |
| 60 | MODULE_ALIAS_NETDEV("ip6tnl0"); | ||
| 60 | 61 | ||
| 61 | #ifdef IP6_TNL_DEBUG | 62 | #ifdef IP6_TNL_DEBUG |
| 62 | #define IP6_TNL_TRACE(x...) printk(KERN_DEBUG "%s:" x "\n", __func__) | 63 | #define IP6_TNL_TRACE(x...) printk(KERN_DEBUG "%s:" x "\n", __func__) |