From 8a86a4902d2c787ff66e3b54fff8f70ac2f05884 Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Thu, 14 Jul 2011 17:20:32 -0500
Subject: [PATCH] --- yaml --- r: 267689 b: refs/heads/master c:
 af7daa15f7ab1c43091e6fc437bd2b4b5e7df60a h: refs/heads/master i:   267687:
 a314f47d16b09b49eedcb745e88e54aad55b284c v: v3

---
 [refs]                                    |  2 +-
 trunk/drivers/staging/rtl8192e/rtl_core.c | 11 -----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index fecbeb2174e2..360e53a9b86e 100644
--- 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
index ae983a2237bb..3711eb431f0d 100644
--- 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))) {