[target] generic: ESFQ patch, only include net/netfilter/nf_conntrack.h when CONFIG_N...

[openwrt.git] / target / linux / brcm63xx / files / include / asm-mips / mach-bcm63xx / bcm63xx_io.h

diff --git a/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_io.h b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_io.h
index 5331c25..31e950e 100644 (file)
--- a/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_io.h
+++ b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_io.h
@@ -93,15 +93,15 @@
 /*
  * helpers for the SPI register sets
  */
-#define bcm_spi_readb(o)       bcm_readb(bcm63xx_regset_address(RSET_SPI) + \
+#define bcm_spi_readb(b,o)     bcm_readb((b) + \
                                        bcm63xx_spireg(o))
-#define bcm_spi_readw(o)       bcm_readw(bcm63xx_regset_address(RSET_SPI) + \
+#define bcm_spi_readw(b,o)     bcm_readw((b) + \
                                        bcm63xx_spireg(o))
-#define bcm_spi_writeb(v,o)    bcm_writeb((v), \
-                                       bcm63xx_regset_address(RSET_SPI) + \
+#define bcm_spi_writeb(v,b,o)  bcm_writeb((v), \
+                                       (b) + \
                                        bcm63xx_spireg(o))
-#define bcm_spi_writew(v,o)    bcm_writew((v), \
-                                       bcm63xx_regset_address(RSET_SPI) + \
+#define bcm_spi_writew(v,b,o)  bcm_writew((v), \
+                                       (b) + \
                                        bcm63xx_spireg(o))
 
 #endif /* ! BCM63XX_IO_H_ */