---

yaml --- r: 133399 b: refs/heads/master c: d45b70a h: refs/heads/master i: 133397: b38b318 133395: 51db59d 133391: 87a5b3b v: v3
git-mirror · Mar 24, 2009 · 76c6f2a · 76c6f2a
1 parent 1dc44e5
commit 76c6f2a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 43 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 662641d98b4396b48f513726d141c5f646c08259
+refs/heads/master: d45b70ab9bbf1a46ae52972d532f9e267b8d39d9
diff --git a/trunk/include/asm-mn10300/ide.h b/trunk/include/asm-mn10300/ide.h
diff --git a/trunk/include/linux/ide.h b/trunk/include/linux/ide.h
@@ -26,7 +26,7 @@
 #include <asm/io.h>
 #include <asm/mutex.h>
 
-#if defined(CONFIG_CRIS) || defined(CONFIG_FRV)
+#if defined(CONFIG_CRIS) || defined(CONFIG_FRV) || defined(CONFIG_MN10300)
 # define SUPPORT_VLB_SYNC 0
 #else
 # define SUPPORT_VLB_SYNC 1
@@ -194,8 +194,7 @@ static inline void ide_std_init_ports(hw_regs_t *hw,
 }
 
 #if defined(CONFIG_ARM) || defined(CONFIG_M68K) || defined(CONFIG_MIPS) || \
-    defined(CONFIG_MN10300) || defined(CONFIG_PARISC) \
-    || defined(CONFIG_PPC) || defined(CONFIG_SPARC) || defined(CONFIG_SPARC64)
+    defined(CONFIG_PARISC) || defined(CONFIG_PPC) || defined(CONFIG_SPARC)
 #include <asm/ide.h>
 #else
 #include <asm-generic/ide_iops.h>