---

yaml --- r: 267689 b: refs/heads/master c: af7daa1 h: refs/heads/master i: 267687: a314f47 v: v3
git-mirror · Aug 24, 2011 · 8a86a49 · 8a86a49
1 parent fa5a36e
commit 8a86a49
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69dbddce03e40650fb28fc5954c3ccd59a53d201
+refs/heads/master: af7daa15f7ab1c43091e6fc437bd2b4b5e7df60a
diff --git a/trunk/drivers/staging/rtl8192e/rtl_core.c b/trunk/drivers/staging/rtl8192e/rtl_core.c
@@ -2975,17 +2975,6 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev,
 
 	pci_set_master(pdev);
 
-#ifdef CONFIG_64BIT_DMA
-	if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
-		printk("RTL819xCE: Using 64bit DMA\n");
-		if (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64))) {
-			printk( "Unable to obtain 64bit DMA for consistent allocations\n");
-			pci_disable_device(pdev);
-			return -ENOMEM;
-		}
-		bdma64 = true;
-	} else
-#endif
 	{
 		if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
 			if (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32))) {