changes to make it compile

[netwatch.git] / net / 3c90x.c

diff --git a/net/3c90x.c b/net/3c90x.c
index e7b95e950a0c2e39b3a081d1ad39b9775feb8257..711b69de7f6308466c4581f7786740037c472405 100644 (file)
--- a/net/3c90x.c
+++ b/net/3c90x.c
@@ -38,6 +38,7 @@
  */
 
 #include "etherboot-compat.h"
+#include "net.h"
 #include <timer.h>
 #include <io.h>
 #include <pci.h>
@@ -689,7 +690,6 @@ void a3c90x_disable(struct dev *dev)
  ***/
 static int a3c90x_probe(struct pci_dev * pci, void * data)
 {
-    struct nic *nic = (struct nic *)data;
     INF_3C90X.is3c556 = (pci->did == 0x6055);
  
     int i, c;
@@ -713,8 +713,8 @@ static int a3c90x_probe(struct pci_dev * pci, void * data)
 /*
     adjust_pci_dev(pci);
 */
-    nic->ioaddr = ioaddr & ~3;
-    nic->irqno = 0;
+    nic.ioaddr = ioaddr & ~3;
+    nic.irqno = 0;
 
     INF_3C90X.IOAddr = ioaddr & ~3;
     INF_3C90X.CurrentWindow = 255;
@@ -824,7 +824,7 @@ static int a3c90x_probe(struct pci_dev * pci, void * data)
     /** Fill in our entry in the etherboot arp table **/
 /* XXX ? for lwip? 
     for(i=0;i<ETH_ALEN;i++)
-       nic->node_addr[i] = (eeprom[HWADDR_OFFSET + i/2] >> (8*((i&1)^1))) & 0xff;
+       nic.node_addr[i] = (eeprom[HWADDR_OFFSET + i/2] >> (8*((i&1)^1))) & 0xff;
 */
 
     /** Read the media options register, print a message and set default
@@ -964,8 +964,8 @@ static int a3c90x_probe(struct pci_dev * pci, void * data)
                                  cmdAcknowledgeInterrupt, 0x661);
 
     /* * Set our exported functions **/
-    nic->poll     = a3c90x_poll;
-    nic->transmit = a3c90x_transmit;
+    nic.poll     = a3c90x_poll;
+    nic.transmit = a3c90x_transmit;
 
     return 1;
 }