From ccad9628f875aabbb960992ce1db7d9f04a16b07 Mon Sep 17 00:00:00 2001
From: Guo-Fu Tseng <cooldavid@cooldavid.org>
Date: Wed, 3 Dec 2008 21:20:04 -0800
Subject: [PATCH] --- yaml --- r: 122446 b: refs/heads/master c:
 e4e6c38cab208b369bfc8e9a57186581bf0b9987 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/jme.c | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 2dbe000a7121..be5b1a236438 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f40bf46897ddb57f149c0758f0cef0cc7782f7f
+refs/heads/master: e4e6c38cab208b369bfc8e9a57186581bf0b9987
diff --git a/trunk/drivers/net/jme.c b/trunk/drivers/net/jme.c
index e10d9f38662c..15035cb1738a 100644
--- a/trunk/drivers/net/jme.c
+++ b/trunk/drivers/net/jme.c
@@ -2591,14 +2591,6 @@ static const struct ethtool_ops jme_ethtool_ops = {
 static int
 jme_pci_dma64(struct pci_dev *pdev)
 {
-	if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK))
-		if (!pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK))
-			return 1;
-
-	if (!pci_set_dma_mask(pdev, DMA_40BIT_MASK))
-		if (!pci_set_consistent_dma_mask(pdev, DMA_40BIT_MASK))
-			return 1;
-
 	if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK))
 		if (!pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK))
 			return 0;