diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-14 23:24:30 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-14 23:24:30 -0500 |
| commit | 958fc41e320e17bd4db22d6da81184654350aaab (patch) | |
| tree | 90a94c9d82508d2cf8264afa44e7215ae6998c8b /net | |
| parent | 6e17e8b9fb74b9fb9f6ea331f7f4a049c5b4c4b8 (diff) | |
| parent | 282a39546f6d213399b325ec830ee37e8d915924 (diff) | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ieee802154/wpan-class.c b/net/ieee802154/wpan-class.c index 38bac70cca10..268691256a6d 100644 --- a/net/ieee802154/wpan-class.c +++ b/net/ieee802154/wpan-class.c | |||
| @@ -205,7 +205,7 @@ err_nl: | |||
| 205 | err: | 205 | err: |
| 206 | return rc; | 206 | return rc; |
| 207 | } | 207 | } |
| 208 | module_init(wpan_phy_class_init); | 208 | subsys_initcall(wpan_phy_class_init); |
| 209 | 209 | ||
| 210 | static void __exit wpan_phy_class_exit(void) | 210 | static void __exit wpan_phy_class_exit(void) |
| 211 | { | 211 | { |