Merge tag 'omap-for-v4.7/fixes-v2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / drivers / net / ethernet / freescale / fman / fman.c

diff --git a/drivers/net/ethernet/freescale/fman/fman.c b/drivers/net/ethernet/freescale/fman/fman.c
index ea83712a6d62cf89136f19fbe6b0ce1cc18370ab..1de2e1e51c2be6c2259f8d6dca61b92a1338597e 100644 (file)
--- a/drivers/net/ethernet/freescale/fman/fman.c
+++ b/drivers/net/ethernet/freescale/fman/fman.c
@@ -615,7 +615,7 @@ struct fman {
        struct fman_cfg *cfg;
        struct muram_info *muram;
        /* cam section in muram */
-       int cam_offset;
+       unsigned long cam_offset;
        size_t cam_size;
        /* Fifo in MURAM */
        int fifo_offset;
@@ -2772,7 +2772,7 @@ static struct fman *read_dts_node(struct platform_device *of_dev)
        /* Get the FM address */
        res = platform_get_resource(of_dev, IORESOURCE_MEM, 0);
        if (!res) {
-               dev_err(&of_dev->dev, "%s: Can't get FMan memory resouce\n",
+               dev_err(&of_dev->dev, "%s: Can't get FMan memory resource\n",
                        __func__);
                goto fman_node_put;
        }