From a68258addfa2df528774617af6116ad844583349 Mon Sep 17 00:00:00 2001
From: stephen hemminger <shemminger@vyatta.com>
Date: Thu, 10 Mar 2011 11:43:19 +0000
Subject: [PATCH] --- yaml --- r: 234062 b: refs/heads/master c:
 6dfbd87a20a737641ef228230c77f4262434fa24 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/net/ipv6/ip6_tunnel.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 51c93417f9c6..b99124fc29da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bef6e7e76868ab454d5e83635a4a7a1961c74fb5
+refs/heads/master: 6dfbd87a20a737641ef228230c77f4262434fa24
diff --git a/trunk/net/ipv6/ip6_tunnel.c b/trunk/net/ipv6/ip6_tunnel.c
index 4f4483e697bd..e528a42a52be 100644
--- a/trunk/net/ipv6/ip6_tunnel.c
+++ b/trunk/net/ipv6/ip6_tunnel.c
@@ -57,6 +57,7 @@
 MODULE_AUTHOR("Ville Nuorvala");
 MODULE_DESCRIPTION("IPv6 tunneling device");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS_NETDEV("ip6tnl0");
 
 #ifdef IP6_TNL_DEBUG
 #define IP6_TNL_TRACE(x...) printk(KERN_DEBUG "%s:" x "\n", __func__)