Purge warnings from prism2 drivers

[people/xl0/gpxe.git] / src / drivers / net / prism2_pci.c

diff --git a/src/drivers/net/prism2_pci.c b/src/drivers/net/prism2_pci.c
index bfad2fd..918a66d 100644 (file)
--- a/src/drivers/net/prism2_pci.c
+++ b/src/drivers/net/prism2_pci.c
@@ -14,8 +14,8 @@ $Id$
  * your option) any later version.
  */
 
-#include "pci.h"
-#include "nic.h"
+#include <gpxe/pci.h>
+#include <nic.h>
 
 #define WLAN_HOSTIF WLAN_PCI
 #include "prism2.c"
@@ -28,25 +28,23 @@ static int prism2_pci_probe ( struct nic *nic, struct pci_device *pci ) {
   pci_read_config_dword( pci, PRISM2_PCI_MEM_BASE, &membase);
   membase &= PCI_BASE_ADDRESS_MEM_MASK;
   hw->membase = (uint32_t) phys_to_virt(membase);
-  printf ( "Prism2.5 has registers at %#x\n", hw->membase );
+  printf ( "Prism2.5 has registers at %#lx\n", hw->membase );
   nic->ioaddr = hw->membase;
 
   return prism2_probe ( nic, hw );
 }
 
-static void prism2_pci_disable ( struct nic *nic,
-                                struct pci_device *pci __unused ) {
+static void prism2_pci_disable ( struct nic *nic ) {
   prism2_disable ( nic );
 }
 
-static struct pci_id prism2_pci_nics[] = {
+static struct pci_device_id prism2_pci_nics[] = {
 PCI_ROM(0x1260, 0x3873, "prism2_pci",  "Harris Semiconductor Prism2.5 clone"),
 PCI_ROM(0x1260, 0x3873, "hwp01170",    "ActionTec HWP01170"),
 PCI_ROM(0x1260, 0x3873, "dwl520",      "DLink DWL-520"),
 };
 
-static struct pci_driver prism2_pci_driver =
-       PCI_DRIVER ( prism2_pci_nics, PCI_NO_CLASS );
+PCI_DRIVER ( prism2_pci_driver, prism2_pci_nics, PCI_NO_CLASS );
 
 DRIVER ( "Prism2/PCI", nic_driver, pci_driver, prism2_pci_driver,
         prism2_pci_probe, prism2_pci_disable );