aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/drivers/net/meth.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-04-25 00:31:07 -0700
committerDavid S. Miller <davem@davemloft.net>2008-04-25 00:31:07 -0700
commitcc93d7d77d28d65d4f947dabc95a01c42d713ea3 (patch)
treebdaa01a54c7d881b7087551daf85fa52c61b3d1c /drivers/net/meth.c
parentxfrm: alg_key_len & alg_icv_len should be unsigned (diff)
parent[netdrvr] tehuti: move ioctl perm check closer to function start (diff)
downloadwireguard-linux-cc93d7d77d28d65d4f947dabc95a01c42d713ea3.tar.xz
wireguard-linux-cc93d7d77d28d65d4f947dabc95a01c42d713ea3.zip
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/meth.c')
-rw-r--r--drivers/net/meth.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/meth.c b/drivers/net/meth.c
index cdaa8fc21809..0b32648a2136 100644
--- a/drivers/net/meth.c
+++ b/drivers/net/meth.c
@@ -830,6 +830,7 @@ static struct platform_driver meth_driver = {
.remove = __devexit_p(meth_remove),
.driver = {
.name = "meth",
+ .owner = THIS_MODULE,
}
};
@@ -855,3 +856,4 @@ module_exit(meth_exit_module);
MODULE_AUTHOR("Ilya Volynets <ilya@theIlya.com>");
MODULE_DESCRIPTION("SGI O2 Builtin Fast Ethernet driver");
MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:meth");