diff options
author | Colin Cross <ccross@android.com> | 2011-01-07 17:20:53 -0800 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2011-01-07 17:20:53 -0800 |
commit | 351516118103c6c7bb5321aa9d5866eb3dc0d5ca (patch) | |
tree | bf8ecc55d77847ec8299bcf964352bef38121cc5 /net/l2tp | |
parent | c37bff78783d40d6e604129135c207e279de902f (diff) | |
parent | bd842b53fada517017d192c8a12fc9a38e6250e1 (diff) |
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Conflicts:
arch/arm/mm/cache-v6.S
Change-Id: I1a2063218dd705a762a40f4a9dfe504ce1a1d491
Diffstat (limited to 'net/l2tp')
-rw-r--r-- | net/l2tp/l2tp_ip.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c index 226a0ae3bcfd..a2cec796a321 100644 --- a/net/l2tp/l2tp_ip.c +++ b/net/l2tp/l2tp_ip.c @@ -676,4 +676,8 @@ MODULE_LICENSE("GPL"); MODULE_AUTHOR("James Chapman <jchapman@katalix.com>"); MODULE_DESCRIPTION("L2TP over IP"); MODULE_VERSION("1.0"); -MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_INET, SOCK_DGRAM, IPPROTO_L2TP); + +/* Use the value of SOCK_DGRAM (2) directory, because __stringify does't like + * enums + */ +MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_INET, 2, IPPROTO_L2TP); |