From c97f1acbeb01a19261de677e118da320223caaa2 Mon Sep 17 00:00:00 2001
From: Karsten Keil <kkeil@suse.de>
Date: Tue, 3 Feb 2009 15:18:01 -0800
Subject: [PATCH] --- yaml --- r: 130884 b: refs/heads/master c:
 4d7155b932b8129c72e2f2714890e20b2a05e0b7 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index d5e4b2376f16..e5eca0f12aff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 714c48f1bb553a2e5dd8d6ff66accc7c51218ac9
+refs/heads/master: 4d7155b932b8129c72e2f2714890e20b2a05e0b7
diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c
index c986978ce761..6bd63cc67b3e 100644
--- a/trunk/drivers/net/e1000/e1000_main.c
+++ b/trunk/drivers/net/e1000/e1000_main.c
@@ -940,7 +940,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
 		err = pci_enable_device(pdev);
 	} else {
 		bars = pci_select_bars(pdev, IORESOURCE_MEM);
-		err = pci_enable_device(pdev);
+		err = pci_enable_device_mem(pdev);
 	}
 	if (err)
 		return err;