Merge branch 'acpica' into release

[~andy/linux] / fs / ocfs2 / stackglue.c

diff --git a/fs/ocfs2/stackglue.c b/fs/ocfs2/stackglue.c
index ed12c1161479cb12b9d0a0c277da695d33dba4c5..f3df0baa9a488200a5d2c72c53cd47f53b03209c 100644 (file)
--- a/fs/ocfs2/stackglue.c
+++ b/fs/ocfs2/stackglue.c
@@ -624,7 +624,7 @@ static ctl_table ocfs2_nm_table[] = {
                .data           = ocfs2_hb_ctl_path,
                .maxlen         = OCFS2_MAX_HB_CTL_PATH,
                .mode           = 0644,
-               .proc_handler   = &proc_dostring,
+               .proc_handler   = proc_dostring,
        },
        { }
 };