summaryrefslogtreecommitdiffstats
path: root/drivers/net/pasemi_mac.h
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2007-09-15 13:44:07 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 16:50:55 -0700
commitb6e05a1b67a4b2e122d78a3f0b7ec7c779bd903c (patch)
tree51b9aa288c8fdd0d32de1d11365ef31b7558ae4c /drivers/net/pasemi_mac.h
parenta85b94222d8b95e184941183f28b06b637cc4dee (diff)
downloadblackbird-op-linux-b6e05a1b67a4b2e122d78a3f0b7ec7c779bd903c.tar.gz
blackbird-op-linux-b6e05a1b67a4b2e122d78a3f0b7ec7c779bd903c.zip
pasemi_mac: Stop using the pci config space accessors for register read/writes
Move away from using the pci config access functions for simple register access. Our device has all of the registers in the config space (hey, from the hardware point of view it looks reasonable :-), so we need to somehow get to it. Newer firmwares have it in the device tree such that we can just get it and ioremap it there (in case it ever moves in future products). For now, provide a hardcoded fallback for older firmwares. [ Resolved napi_struct conflicts... -DaveM ] Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: Jeff Garzik <jeff@garzik.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/pasemi_mac.h')
-rw-r--r--drivers/net/pasemi_mac.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/pasemi_mac.h b/drivers/net/pasemi_mac.h
index 85d3b7856e5f..ef443640c768 100644
--- a/drivers/net/pasemi_mac.h
+++ b/drivers/net/pasemi_mac.h
@@ -52,6 +52,9 @@ struct pasemi_mac_rxring {
struct pasemi_mac {
struct net_device *netdev;
+ void __iomem *regs;
+ void __iomem *dma_regs;
+ void __iomem *iob_regs;
struct pci_dev *pdev;
struct pci_dev *dma_pdev;
struct pci_dev *iob_pdev;
OpenPOWER on IntegriCloud