--- a/drivers/net/dm9000.c	2008-10-13 05:29:15.000000000 -0700
+++ b/drivers/net/dm9000.c	2008-10-13 05:40:13.000000000 -0700
@@ -47,14 +47,6 @@
 #define CARDNAME	"dm9000"
 #define DRV_VERSION	"1.31"
 
-#ifdef CONFIG_BLACKFIN
-#define readsb	insb
-#define readsw	insw
-#define readsl	insl
-#define writesb	outsb
-#define writesw	outsw
-#define writesl	outsl
-#endif
 
 /*
  * Transmit timeout, default 5 seconds.
@@ -185,7 +177,40 @@ iow(board_info_t * db, int reg, int valu
 }
 
 /* routines for sending block to chip */
+#ifdef CONFIG_BLACKFIN
+static void dm9000_outblk_8bit(void __iomem *reg, void *data, int count)
+{
+	outsb((unsigned long)reg, data, count);
+}
 
+static void dm9000_outblk_16bit(void __iomem *reg, void *data, int count)
+{
+	outsw((unsigned long)reg, data, (count+1) >> 1);
+}
+
+static void dm9000_outblk_32bit(void __iomem *reg, void *data, int count)
+{
+	outsl((unsigned long)reg, data, (count+3) >> 2);
+}
+
+/* input block from chip to memory */
+
+static void dm9000_inblk_8bit(void __iomem *reg, void *data, int count)
+{
+	insb((unsigned long)reg, data, count);
+}
+
+
+static void dm9000_inblk_16bit(void __iomem *reg, void *data, int count)
+{
+	insw((unsigned long)reg, data, (count+1) >> 1);
+}
+
+static void dm9000_inblk_32bit(void __iomem *reg, void *data, int count)
+{
+	insl((unsigned long)reg, data, (count+3) >> 2);
+}
+#else
 static void dm9000_outblk_8bit(void __iomem *reg, void *data, int count)
 {
 	writesb(reg, data, count);
@@ -218,6 +243,7 @@ static void dm9000_inblk_32bit(void __io
 {
 	readsl(reg, data, (count+3) >> 2);
 }
+#endif
 
 /* dump block from chip to null */