diff --git a/[refs] b/[refs]
index a4d27cf80946..29694dab9869 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f367bed005b06db7067fc378a5f2253fac54e5d9
+refs/heads/master: 729d4de96a5c090e40a918a41f63b7fb1b27c240
diff --git a/trunk/include/linux/ide.h b/trunk/include/linux/ide.h
index a3b69c10d667..bc26b2f27359 100644
--- a/trunk/include/linux/ide.h
+++ b/trunk/include/linux/ide.h
@@ -26,7 +26,7 @@
 #include <asm/semaphore.h>
 #include <asm/mutex.h>
 
-#if defined(CRIS) || defined(FRV)
+#if defined(CONFIG_CRIS) || defined(CONFIG_FRV)
 # define SUPPORT_VLB_SYNC 0
 #else
 # define SUPPORT_VLB_SYNC 1