diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-10 23:00:44 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-10 23:00:44 +0100 |
| commit | bef6e7e76868ab454d5e83635a4a7a1961c74fb5 (patch) | |
| tree | 1a7417b9dde942cc71f87c02688c6ac6b0e57a72 /net/ipv6 | |
| parent | net: bridge builtin vs. ipv6 modular (diff) | |
| parent | Merge branch 'media_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/m... (diff) | |
| download | linux-bef6e7e76868ab454d5e83635a4a7a1961c74fb5.tar.xz linux-bef6e7e76868ab454d5e83635a4a7a1961c74fb5.zip | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'net/ipv6')
| -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 8ce38f10a547..d2c16e10f650 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -1290,4 +1290,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"); |