---

yaml --- r: 162505 b: refs/heads/master c: 3bc9da3 h: refs/heads/master i: 162503: 22443e3 v: v3
git-mirror · Sep 15, 2009 · 73976ca · 73976ca
1 parent 05c346e
commit 73976ca
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3f415a3b4f2982391c0e790b226b43793a8ae72
+refs/heads/master: 3bc9da3ed44c7abee310b3c4761845cb0e9bae60
diff --git a/trunk/drivers/staging/et131x/et1310_tx.c b/trunk/drivers/staging/et131x/et1310_tx.c
@@ -315,7 +315,7 @@ void et131x_tx_dma_enable(struct et131x_adapter *etdev)
 		 */
 		csr.bits.sngl_epkt_mode = 1;
 		csr.bits.halt = 0;
-		csr.bits.cache_thrshld = etdev->RegistryDMACache;
+		csr.bits.cache_thrshld = PARM_DMA_CACHE_DEF;
 		writel(csr.value, &etdev->regs->txdma.csr.value);
 	}
 

diff --git a/trunk/drivers/staging/et131x/et131x_adapter.h b/trunk/drivers/staging/et131x/et131x_adapter.h
@@ -271,7 +271,6 @@ struct et131x_adapter {
 	/* Validation helpers */
 	u8 RegistryPMWOL;
 	u8 RegistryNMIDisable;
-	u32 RegistryDMACache;
 	u32 RegistrySCGain;
 	u8 RegistryPhyLoopbk;	/* Enable Phy loopback */
 

diff --git a/trunk/drivers/staging/et131x/et131x_config.c b/trunk/drivers/staging/et131x/et131x_config.c
@@ -265,7 +265,6 @@ void et131x_config_parse(struct et131x_adapter *etdev)
 	else
 		etdev->RegistryNMIDisable = PARM_NMI_DISABLE_DEF;
 
-	etdev->RegistryDMACache = PARM_DMA_CACHE_DEF;
 	etdev->RegistryPhyLoopbk = PARM_PHY_LOOPBK_DEF;
 
 	/* Set the MAC address to a default */