Merge from Etherboot 5.4

diff --cc src/drivers/net/e1000.c
index 2eb6b33,d5de2cc..5eab682
--- 1/src/drivers/net/e1000.c
--- 2/src/drivers/net/e1000.c
+++ b/src/drivers/net/e1000.c
@@@ -3384,11 -3357,6 +3384,30 @@@ e1000_sw_init(struct pci_device *pdev, 
        return E1000_SUCCESS;
  }
  
 +
++/******************************************************************************
++ * Functions not present in the linux driver
++ ******************************************************************************/
++
++#if 0
++static uint32_t
++e1000_io_read(struct e1000_hw *hw __unused, uint32_t port)
++{
++        return inl(port);
++}
++#endif
++
++static void
++e1000_io_write(struct e1000_hw *hw __unused, uint32_t port, uint32_t value)
++{
++        outl(value, port);
++}
++
++
 +/******************************************************************************
 + * Functions not present in the linux driver
 + ******************************************************************************/
 +
  static void fill_rx (void)
  {
        struct e1000_rx_desc *rd;