diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-29 01:41:32 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-29 01:41:32 -0700 |
| commit | 3f1f39c42b24d5c20eb593ce80b9c4d5ec1e2148 (patch) | |
| tree | 785e5d697e9c2e4b8fd012a7e9c8aac263c186a5 /net/wimax/stack.c | |
| parent | dfe9a837987aacaffbce020fbf54d8e0afa4bde1 (diff) | |
| parent | 7481806dcfd07e9a636155554f6f4b4fbd976381 (diff) | |
| download | lwn-3f1f39c42b24d5c20eb593ce80b9c4d5ec1e2148.tar.gz lwn-3f1f39c42b24d5c20eb593ce80b9c4d5ec1e2148.zip | |
Merge branch 'linux-2.6.31.y' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax
Diffstat (limited to 'net/wimax/stack.c')
| -rw-r--r-- | net/wimax/stack.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/wimax/stack.c b/net/wimax/stack.c index 933e1422b09f..79fb7d7c640f 100644 --- a/net/wimax/stack.c +++ b/net/wimax/stack.c @@ -402,13 +402,15 @@ EXPORT_SYMBOL_GPL(wimax_dev_init); extern struct genl_ops wimax_gnl_msg_from_user, wimax_gnl_reset, - wimax_gnl_rfkill; + wimax_gnl_rfkill, + wimax_gnl_state_get; static struct genl_ops *wimax_gnl_ops[] = { &wimax_gnl_msg_from_user, &wimax_gnl_reset, &wimax_gnl_rfkill, + &wimax_gnl_state_get, }; @@ -533,6 +535,7 @@ struct d_level D_LEVEL[] = { D_SUBMODULE_DEFINE(op_msg), D_SUBMODULE_DEFINE(op_reset), D_SUBMODULE_DEFINE(op_rfkill), + D_SUBMODULE_DEFINE(op_state_get), D_SUBMODULE_DEFINE(stack), }; size_t D_LEVEL_SIZE = ARRAY_SIZE(D_LEVEL); |