diff --git a/[refs] b/[refs]
index c9a0469de5f6..d0913741dc87 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c824498db47285aeff430c007685a193b673c949
+refs/heads/master: bde7db8608cab31c6d92982b00e8064bd492a85b
diff --git a/trunk/include/asm-blackfin/uaccess.h b/trunk/include/asm-blackfin/uaccess.h
index bfcb6794c672..2233f8f9314d 100644
--- a/trunk/include/asm-blackfin/uaccess.h
+++ b/trunk/include/asm-blackfin/uaccess.h
@@ -14,7 +14,7 @@
 #include <linux/string.h>
 
 #include <asm/segment.h>
-#ifndef CONFIG_NO_ACCESS_CHECK
+#ifdef CONFIG_ACCESS_CHECK
 # include <asm/bfin-global.h>
 #endif
 
@@ -56,7 +56,7 @@ static inline int is_in_rom(unsigned long addr)
  * get_fs() == KERNEL_DS, checking is bypassed.
  */
 
-#ifdef CONFIG_NO_ACCESS_CHECK
+#ifndef CONFIG_ACCESS_CHECK
 static inline int _access_ok(unsigned long addr, unsigned long size) { return 1; }
 #else
 #ifdef CONFIG_ACCESS_OK_L1