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/ipv4 | |
| parent | dcbcdf22f500ac6e4ec06485341024739b9dc241 (diff) | |
| parent | 9179746652faf0aba07b8b7f770dcf29892a24c6 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/ip_gre.c | 2 | ||||
| -rw-r--r-- | net/ipv4/ipip.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 6613edfac28c..d1d0e2c256fc 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c | |||
| @@ -1765,4 +1765,4 @@ module_exit(ipgre_fini); | |||
| 1765 | MODULE_LICENSE("GPL"); | 1765 | MODULE_LICENSE("GPL"); |
| 1766 | MODULE_ALIAS_RTNL_LINK("gre"); | 1766 | MODULE_ALIAS_RTNL_LINK("gre"); |
| 1767 | MODULE_ALIAS_RTNL_LINK("gretap"); | 1767 | MODULE_ALIAS_RTNL_LINK("gretap"); |
| 1768 | MODULE_ALIAS("gre0"); | 1768 | MODULE_ALIAS_NETDEV("gre0"); |
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c index 988f52fba54a..a5f58e7cbb26 100644 --- a/net/ipv4/ipip.c +++ b/net/ipv4/ipip.c | |||
| @@ -913,4 +913,4 @@ static void __exit ipip_fini(void) | |||
| 913 | module_init(ipip_init); | 913 | module_init(ipip_init); |
| 914 | module_exit(ipip_fini); | 914 | module_exit(ipip_fini); |
| 915 | MODULE_LICENSE("GPL"); | 915 | MODULE_LICENSE("GPL"); |
| 916 | MODULE_ALIAS("tunl0"); | 916 | MODULE_ALIAS_NETDEV("tunl0"); |