From: Michael Brown <mcb30@etherboot.org>
Date: Thu, 16 Mar 2006 18:51:23 +0000 (+0000)
Subject: Merge from Etherboot 5.4
X-Git-Tag: v0.9.3~1565
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ee0e0f85e2df1e671d771edfa920b1bbdc6356c;p=thirdparty%2Fipxe.git

Merge from Etherboot 5.4
---

4ee0e0f85e2df1e671d771edfa920b1bbdc6356c
diff --cc src/drivers/net/e1000.c
index 2eb6b333a,d5de2cc47..5eab6823e
--- a/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;