From b56b82333e62013838d6c4e5fa1921b4c1f62043 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jirislaby@gmail.com>
Date: Tue, 29 Jan 2008 22:49:16 +0100
Subject: [PATCH] --- yaml --- r: 82657 b: refs/heads/master c:
 915e91d734d33ad303313e05582769dbbefff3b2 h: refs/heads/master i:   82655:
 596b16606ebb693e6d15b1b271bd9c3b39709496 v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/e100.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7732147a8dfa..4d8022b5f698 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1145d954a51df9362d7eaa2c68405fc226418f34
+refs/heads/master: 915e91d734d33ad303313e05582769dbbefff3b2
diff --git a/trunk/drivers/net/e100.c b/trunk/drivers/net/e100.c
index 51cf577035be..9d42dd8f402e 100644
--- a/trunk/drivers/net/e100.c
+++ b/trunk/drivers/net/e100.c
@@ -1958,7 +1958,7 @@ static void e100_rx_clean(struct nic *nic, unsigned int *work_done,
 
 	if(restart_required) {
 		// ack the rnr?
-		writeb(stat_ack_rnr, &nic->csr->scb.stat_ack);
+		iowrite8(stat_ack_rnr, &nic->csr->scb.stat_ack);
 		e100_start_receiver(nic, nic->rx_to_clean);
 		if(work_done)
 			(*work_done)++;
@@ -2774,7 +2774,7 @@ static void __devexit e100_remove(struct pci_dev *pdev)
 		struct nic *nic = netdev_priv(netdev);
 		unregister_netdev(netdev);
 		e100_free(nic);
-		iounmap(nic->csr);
+		pci_iounmap(pdev, nic->csr);
 		free_netdev(netdev);
 		pci_release_regions(pdev);
 		pci_disable_device(pdev);