diff --git a/[refs] b/[refs]
index 5c3ba0b9f0a6..11b32b1f418a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2a2267e7b11fa2de95bfb707c85f2a9880e5206a
+refs/heads/master: 30c7ed5aba72bb7357282cf8f411b2e74d82081c
diff --git a/trunk/include/asm-frv/ide.h b/trunk/include/asm-frv/ide.h
index 7ebcc56a2229..361076611855 100644
--- a/trunk/include/asm-frv/ide.h
+++ b/trunk/include/asm-frv/ide.h
@@ -18,15 +18,7 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 
-/****************************************************************************/
-/*
- * some bits needed for parts of the IDE subsystem to compile
- */
-#define __ide_mm_insw(port, addr, n)	insw((unsigned long) (port), addr, n)
-#define __ide_mm_insl(port, addr, n)	insl((unsigned long) (port), addr, n)
-#define __ide_mm_outsw(port, addr, n)	outsw((unsigned long) (port), addr, n)
-#define __ide_mm_outsl(port, addr, n)	outsl((unsigned long) (port), addr, n)
-
+#include <asm-generic/ide_iops.h>
 
 #endif /* __KERNEL__ */
 #endif /* _ASM_IDE_H */