aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-11-14 20:24:30 -0800
committerDavid S. Miller <davem@davemloft.net>2009-11-14 20:24:30 -0800
commit958fc41e320e17bd4db22d6da81184654350aaab (patch)
tree90a94c9d82508d2cf8264afa44e7215ae6998c8b /net
parent6e17e8b9fb74b9fb9f6ea331f7f4a049c5b4c4b8 (diff)
parent282a39546f6d213399b325ec830ee37e8d915924 (diff)
downloadlinux-2.6.34-ux500-958fc41e320e17bd4db22d6da81184654350aaab.tar.gz
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan
Diffstat (limited to 'net')
-rw-r--r--net/ieee802154/wpan-class.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ieee802154/wpan-class.c b/net/ieee802154/wpan-class.c
index 38bac70cca1..268691256a6 100644
--- a/net/ieee802154/wpan-class.c
+++ b/net/ieee802154/wpan-class.c
@@ -205,7 +205,7 @@ err_nl:
err:
return rc;
}
-module_init(wpan_phy_class_init);
+subsys_initcall(wpan_phy_class_init);
static void __exit wpan_phy_class_exit(void)
{