--- zzzz-none-000/linux-2.6.19.2/arch/mips/momentum/ocelot_3/ocelot_3_fpga.h	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/arch/mips/momentum/ocelot_3/ocelot_3_fpga.h	2007-01-11 07:38:19.000000000 +0000
@@ -51,9 +51,7 @@
 
 extern unsigned long ocelot_fpga_base;
 
-#define __FPGA_REG_TO_ADDR(reg)						\
-	((void *) ocelot_fpga_base + OCELOT_3_REG_##reg)
-#define OCELOT_FPGA_WRITE(x, reg) writeb(x, __FPGA_REG_TO_ADDR(reg))
-#define OCELOT_FPGA_READ(reg) readb(__FPGA_REG_TO_ADDR(reg))
+#define OCELOT_FPGA_WRITE(x, y) writeb(x, ocelot_fpga_base + OCELOT_3_REG_##y)
+#define OCELOT_FPGA_READ(x) readb(ocelot_fpga_base + OCELOT_3_REG_##x)
 
 #endif