X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fppc%2F8xx_io%2Fenet.c;h=a1ba89d412191377885c77d23454f2d7a423efc9;hb=7b563c525e46f373a521421e31aa791cc27beb56;hp=8ddef1c5cf11dd34bdc3fdce793ed9a7e0bedc34;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git

diff --git a/arch/ppc/8xx_io/enet.c b/arch/ppc/8xx_io/enet.c
index 8ddef1c5c..a1ba89d41 100644
--- a/arch/ppc/8xx_io/enet.c
+++ b/arch/ppc/8xx_io/enet.c
@@ -644,7 +644,8 @@ static int __init scc_enet_init(void)
 	struct net_device *dev;
 	struct scc_enet_private *cep;
 	int i, j, k, err;
-	uint dp_offset;
+	void *dp_mem;
+	unsigned int dp_addr;
 	unsigned char	*eap, *ba;
 	dma_addr_t	mem_addr;
 	bd_t		*bd;
@@ -739,13 +740,15 @@ static int __init scc_enet_init(void)
 	 * These are relative offsets in the DP ram address space.
 	 * Initialize base addresses for the buffer descriptors.
 	 */
-	dp_offset = cpm_dpalloc(sizeof(cbd_t) * RX_RING_SIZE, 8);
-	ep->sen_genscc.scc_rbase = dp_offset;
-	cep->rx_bd_base = cpm_dpram_addr(dp_offset);
-
-	dp_offset = cpm_dpalloc(sizeof(cbd_t) * TX_RING_SIZE, 8);
-	ep->sen_genscc.scc_tbase = dp_offset;
-	cep->tx_bd_base = cpm_dpram_addr(dp_offset);
+	dp_mem = m8xx_cpm_dpalloc(sizeof(cbd_t) * RX_RING_SIZE);
+	dp_addr = m8xx_cpm_dpram_offset(dp_mem);
+	ep->sen_genscc.scc_rbase = dp_mem;
+	cep->rx_bd_base = (cbd_t *)&cp->cp_dpmem[dp_addr];
+
+	dp_mem = m8xx_cpm_dpalloc(sizeof(cbd_t) * TX_RING_SIZE);
+	dp_addr = m8xx_cpm_dpram_offset(dp_mem);
+	ep->sen_genscc.scc_tbase = dp_mem;
+	cep->tx_bd_base = (cbd_t *)&cp->cp_dpmem[dp_addr];
 
 	cep->dirty_tx = cep->cur_tx = cep->tx_bd_base;
 	cep->cur_rx = cep->rx_bd_base;