Merge branch 'master' into for-linus

[karo-tx-linux.git] / net / wimax / stack.c

diff --git a/net/wimax/stack.c b/net/wimax/stack.c
index c8866412f8309d065c2bbf74b97491bddcf8364a..813e1eaea29bb2ef71b2e6b4292248837fcef93a 100644 (file)
--- a/net/wimax/stack.c
+++ b/net/wimax/stack.c
@@ -75,8 +75,7 @@ MODULE_PARM_DESC(debug,
  * close to where the data is generated.
  */
 /*
-static const
-struct nla_policy wimax_gnl_re_status_change[WIMAX_GNL_ATTR_MAX + 1] = {
+static const struct nla_policy wimax_gnl_re_status_change[WIMAX_GNL_ATTR_MAX + 1] = {
        [WIMAX_GNL_STCH_STATE_OLD] = { .type = NLA_U8 },
        [WIMAX_GNL_STCH_STATE_NEW] = { .type = NLA_U8 },
 };