---

yaml --- r: 133398 b: refs/heads/master c: 662641d h: refs/heads/master v: v3
git-mirror · Mar 24, 2009 · 1dc44e5 · 1dc44e5
1 parent b38b318
commit 1dc44e5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 27 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86ccf37c6acd74cf7e4b7751ee045de19943c5a0
+refs/heads/master: 662641d98b4396b48f513726d141c5f646c08259
diff --git a/trunk/include/asm-frv/ide.h b/trunk/include/asm-frv/ide.h
diff --git a/trunk/include/linux/ide.h b/trunk/include/linux/ide.h
@@ -193,8 +193,8 @@ static inline void ide_std_init_ports(hw_regs_t *hw,
 	hw->io_ports.ctl_addr = ctl_addr;
 }
 
-#if defined(CONFIG_ARM) || defined(CONFIG_FRV) || defined(CONFIG_M68K) || \
-    defined(CONFIG_MIPS) || defined(CONFIG_MN10300) || defined(CONFIG_PARISC) \
+#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)
 #include <asm/ide.h>
 #else