---

yaml --- r: 122446 b: refs/heads/master c: e4e6c38 h: refs/heads/master v: v3
git-mirror · Dec 4, 2008 · ccad962 · ccad962
1 parent ef79648
commit ccad962
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git 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
@@ -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;