diff --git a/[refs] b/[refs]
index 9cd4651e09af..0e55026033b8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d4f9c55002544bac1c99d0bab46c89319ab876e
+refs/heads/master: f87367a6b1e3ec1fd440158e5eb357fbd5c2288e
diff --git a/trunk/fs/reiserfs/procfs.c b/trunk/fs/reiserfs/procfs.c
index ecc9943202fc..83b9135a411a 100644
--- a/trunk/fs/reiserfs/procfs.c
+++ b/trunk/fs/reiserfs/procfs.c
@@ -20,7 +20,7 @@
 #include <linux/init.h>
 #include <linux/proc_fs.h>
 
-#if defined( REISERFS_PROC_INFO )
+#ifdef CONFIG_REISERFS_PROC_INFO
 
 /*
  * LOCKING: