git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
drivers
/
net
/
b44.h
diff --git
a/drivers/net/b44.h
b/drivers/net/b44.h
index
23bee93
..
22647be
100644
(file)
--- 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 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 */
/* 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;
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;
struct pci_dev *pdev;
struct net_device *dev;