diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-10 17:26:00 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-10 17:26:00 -0500 |
| commit | 33175d84ee3fa29991adb80513683e010769e807 (patch) | |
| tree | 3731f61cf82451b6892cf1368701e57e35d92908 /net/ipv4/ip_gre.c | |
| parent | c5908939b2738bafe1b309bc2465cb9f2e6184c5 (diff) | |
| parent | 6dfbd87a20a737641ef228230c77f4262434fa24 (diff) | |
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/ipv4/ip_gre.c')
| -rw-r--r-- | net/ipv4/ip_gre.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index f9af98dd7561..71465955520b 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c | |||
| @@ -1766,4 +1766,4 @@ module_exit(ipgre_fini); | |||
| 1766 | MODULE_LICENSE("GPL"); | 1766 | MODULE_LICENSE("GPL"); |
| 1767 | MODULE_ALIAS_RTNL_LINK("gre"); | 1767 | MODULE_ALIAS_RTNL_LINK("gre"); |
| 1768 | MODULE_ALIAS_RTNL_LINK("gretap"); | 1768 | MODULE_ALIAS_RTNL_LINK("gretap"); |
| 1769 | MODULE_ALIAS("gre0"); | 1769 | MODULE_ALIAS_NETDEV("gre0"); |