Purge warnings from prism2 drivers

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

diff --git a/src/drivers/net/prism2_plx.c b/src/drivers/net/prism2_plx.c
index 36c0c5a..0746035 100644 (file)
--- a/src/drivers/net/prism2_plx.c
+++ b/src/drivers/net/prism2_plx.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_PLX
 #include "prism2.c"
@@ -50,8 +50,8 @@ static int prism2_find_plx ( hfa384x_t *hw, struct pci_device *p )
   /* Fill out hw structure */
   hw->membase = attr_mem;
   hw->iobase = iobase;
-  printf ( "PLX9052 has local config registers at %#hx\n", plx_lcr );
-  printf ( "Prism2 has attribute memory at %#x and I/O base at %#hx\n", attr_mem, iobase );
+  printf ( "PLX9052 has local config registers at %#lx\n", plx_lcr );
+  printf ( "Prism2 has attribute memory at %#lx and I/O base at %#lx\n", attr_mem, iobase );
 
   /* Search for CIS strings */
   printf ( "Searching for PCMCIA card...\n" );
@@ -90,12 +90,11 @@ static int prism2_plx_probe ( struct nic *nic, struct pci_device *pci ) {
   return prism2_probe ( nic, hw );
 }
 
-static void prism2_plx_disable ( struct nic *nic,
-                                struct pci_device *pci __unused ) {
+static void prism2_plx_disable ( struct nic *nic ) {
   prism2_disable ( nic );
 }
 
-static struct pci_id prism2_plx_nics[] = {
+static struct pci_device_id prism2_plx_nics[] = {
 PCI_ROM(0x1385, 0x4100, "ma301",         "Netgear MA301"),
 PCI_ROM(0x10b7, 0x7770, "3c-airconnect", "3Com AirConnect"),
 PCI_ROM(0x111a, 0x1023, "ss1023",        "Siemens SpeedStream SS1023"),
@@ -109,8 +108,7 @@ PCI_ROM(0xec80, 0xec00, "f5d6000",       "Belkin F5D6000"),
 PCI_ROM(0x126c, 0x8030, "emobility",     "Nortel emobility"),
 };
 
-static struct pci_driver prism2_plx_driver =
-       PCI_DRIVER ( prism2_plx_nics, PCI_NO_CLASS );
+PCI_DRIVER ( prism2_plx_driver, prism2_plx_nics, PCI_NO_CLASS );
 
 
 DRIVER ( "Prism2/PLX", nic_driver, pci_driver, prism2_plx_driver,