Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes

[linux-2.6] / include / asm-frv / ide.h

diff --git a/include/asm-frv/ide.h b/include/asm-frv/ide.h
index f9caecf7e3c0dd7f5b821336d2101a7647d841ed..8c9a540d434431138deb74ee9f7558b660e9b197 100644 (file)
--- a/include/asm-frv/ide.h
+++ b/include/asm-frv/ide.h
@@ -14,17 +14,10 @@
 
 #ifdef __KERNEL__
 
-#include <linux/config.h>
 #include <asm/setup.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 
-#undef SUPPORT_SLOW_DATA_PORTS
-#define SUPPORT_SLOW_DATA_PORTS 0
-
-#undef SUPPORT_VLB_SYNC
-#define SUPPORT_VLB_SYNC 0
-
 #ifndef MAX_HWIFS
 #define MAX_HWIFS 8
 #endif
@@ -33,10 +26,10 @@
 /*
  * some bits needed for parts of the IDE subsystem to compile
  */
-#define __ide_mm_insw(port, addr, n)   insw(port, addr, n)
-#define __ide_mm_insl(port, addr, n)   insl(port, addr, n)
-#define __ide_mm_outsw(port, addr, n)  outsw(port, addr, n)
-#define __ide_mm_outsl(port, addr, n)  outsl(port, addr, n)
+#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)
 
 
 #endif /* __KERNEL__ */