Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / net / netlabel / netlabel_mgmt.c

diff --git a/net/netlabel/netlabel_mgmt.c b/net/netlabel/netlabel_mgmt.c
index 05d98862fbd484ae3f9db6c0798f72a45d9c7fbb..22c19126780899b464b70f3f4e545b29f1e51f65 100644 (file)
--- a/net/netlabel/netlabel_mgmt.c
+++ b/net/netlabel/netlabel_mgmt.c
@@ -588,7 +588,7 @@ static struct genl_ops netlbl_mgmt_genl_ops[] = {
  * mechanism.  Returns zero on success, negative values on failure.
  *
  */
-int netlbl_mgmt_genl_init(void)
+int __init netlbl_mgmt_genl_init(void)
 {
        int ret_val, i;