aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-03-30 14:24:32 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-03-30 14:24:32 -0700
commit62ad36a8a6541de82984e4f1a6cff09535d68098 (patch)
treeb395d88e2a0e6fe561b385fde097dff7cb3b92f6 /include
parent8b9fc8ae6517086637dd227b7490ec027c867e48 (diff)
parent729d4de96a5c090e40a918a41f63b7fb1b27c240 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: ide: fix defining SUPPORT_VLB_SYNC Revert "ide: change master/slave IDENTIFY order"
Diffstat (limited to 'include')
-rw-r--r--include/linux/ide.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h
index a3b69c10d667..bc26b2f27359 100644
--- a/include/linux/ide.h
+++ b/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

Privacy Policy