Merge tag 'powerpc-6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[sfrench/cifs-2.6.git] / drivers / net / ethernet / freescale / fs_enet / mac-fcc.c

diff --git a/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c b/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c
index c9491b6e8708c4cedee852f51c0f32e6106684ed..e2ffac9eb2adbc13416cb2902683000d00f571a4 100644 (file)
--- a/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c
+++ b/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c
@@ -32,7 +32,6 @@
 #include <linux/platform_device.h>
 #include <linux/phy.h>
 #include <linux/of_address.h>
-#include <linux/of_device.h>
 #include <linux/of_irq.h>
 #include <linux/gfp.h>
 #include <linux/pgtable.h>
@@ -105,7 +104,7 @@ static int do_pd_setup(struct fs_enet_private *fep)
                goto out_ep;
 
        fep->fcc.mem = (void __iomem *)cpm2_immr;
-       fpi->dpram_offset = cpm_dpalloc(128, 32);
+       fpi->dpram_offset = cpm_muram_alloc(128, 32);
        if (IS_ERR_VALUE(fpi->dpram_offset)) {
                ret = fpi->dpram_offset;
                goto out_fcccp;
@@ -547,7 +546,7 @@ static void tx_restart(struct net_device *dev)
        }
        /* Now update the TBPTR and dirty flag to the current buffer */
        W32(ep, fen_genfcc.fcc_tbptr,
-               (uint) (((void *)recheck_bd - fep->ring_base) +
+               (uint)(((void __iomem *)recheck_bd - fep->ring_base) +
                fep->ring_mem_addr));
        fep->dirty_tx = recheck_bd;