X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fnet%2Fb44.h;h=22647be2c0265dde6d7aa957435726175500773a;hb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;hp=23bee93fe63e1a9a01203e8af82ad5cc80c57448;hpb=a2c21200f1c81b08cb55e417b68150bba439b646;p=linux-2.6.git

diff --git a/drivers/net/b44.h b/drivers/net/b44.h
index 23bee93fe..22647be2c 100644
--- a/drivers/net/b44.h
+++ b/drivers/net/b44.h
@@ -395,9 +395,6 @@
 #define SSB_PCI_MASK1		0xfc000000
 #define SSB_PCI_MASK2		0xc0000000
 
-#define br32(REG)	readl(bp->regs + (REG))
-#define bw32(REG,VAL)	writel((VAL), bp->regs + (REG))
-
 /* 4400 PHY registers */
 #define B44_MII_AUXCTRL		24	/* Auxiliary Control */
 #define  MII_AUXCTRL_DUPLEX	0x0001  /* Full Duplex */
@@ -530,7 +527,7 @@ struct b44 {
 	struct net_device_stats	stats;
 	struct b44_hw_stats	hw_stats;
 
-	unsigned long		regs;
+	void __iomem		*regs;
 	struct pci_dev		*pdev;
 	struct net_device	*dev;