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.etherboot.org/people/lynusvaz/gpxe.git/commitdiff_plain/4ee0e0f85e2df1e671d771edfa920b1bbdc6356c?hp=46e7bd5b522c40f180df70fc75a23781db886f6a

Merge from Etherboot 5.4
---

diff --git a/src/drivers/net/e1000.c b/src/drivers/net/e1000.c
index 2eb6b333..5eab6823 100644
--- a/src/drivers/net/e1000.c
+++ b/src/drivers/net/e1000.c
@@ -3385,6 +3385,25 @@ e1000_sw_init(struct pci_device *pdev, struct e1000_hw *hw)
 }
 
 
+/******************************************************************************
+ * 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
  ******************************************************************************/