diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-10 23:26:00 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-10 23:26:00 +0100 |
| commit | 33175d84ee3fa29991adb80513683e010769e807 (patch) | |
| tree | 3731f61cf82451b6892cf1368701e57e35d92908 /net/ipv6/sit.c | |
| parent | tg3: Remove 5750 PCI code (diff) | |
| parent | ip6ip6: autoload ip6 tunnel (diff) | |
| download | linux-33175d84ee3fa29991adb80513683e010769e807.tar.xz linux-33175d84ee3fa29991adb80513683e010769e807.zip | |
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/sit.c')
| -rw-r--r-- | net/ipv6/sit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index b8c8adbd7cf6..3534ceaa4fba 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -1295,4 +1295,4 @@ static int __init sit_init(void) module_init(sit_init); module_exit(sit_cleanup); MODULE_LICENSE("GPL"); -MODULE_ALIAS("sit0"); +MODULE_ALIAS_NETDEV("sit0"); |