diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-10 17:00:44 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-10 17:00:44 -0500 |
| commit | bef6e7e76868ab454d5e83635a4a7a1961c74fb5 (patch) | |
| tree | 1a7417b9dde942cc71f87c02688c6ac6b0e57a72 /net/ipv6 | |
| parent | dcbcdf22f500ac6e4ec06485341024739b9dc241 (diff) | |
| parent | 9179746652faf0aba07b8b7f770dcf29892a24c6 (diff) | |
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) | |||
| 1290 | module_init(sit_init); | 1290 | module_init(sit_init); |
| 1291 | module_exit(sit_cleanup); | 1291 | module_exit(sit_cleanup); |
| 1292 | MODULE_LICENSE("GPL"); | 1292 | MODULE_LICENSE("GPL"); |
| 1293 | MODULE_ALIAS("sit0"); | 1293 | MODULE_ALIAS_NETDEV("sit0"); |