]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - drivers/net/fec_mpc52xx.c
drivers/nubus/: Spelling fixes
[linux-2.6-omap-h63xx.git] / drivers / net / fec_mpc52xx.c
index 79f7eade477356938e113543e354baabef3d81be..58b71e60204e6df0b505980c2205814141d5a171 100644 (file)
@@ -568,8 +568,9 @@ static void mpc52xx_fec_reset_stats(struct net_device *dev)
        struct mpc52xx_fec __iomem *fec = priv->fec;
 
        out_be32(&fec->mib_control, FEC_MIB_DISABLE);
-       memset_io(&fec->rmon_t_drop, 0, (__force u32)&fec->reserved10 -
-                       (__force u32)&fec->rmon_t_drop);
+       memset_io(&fec->rmon_t_drop, 0,
+                  offsetof(struct mpc52xx_fec, reserved10) -
+                  offsetof(struct mpc52xx_fec, rmon_t_drop));
        out_be32(&fec->mib_control, 0);
 
        memset(&dev->stats, 0, sizeof(dev->stats));
@@ -1056,10 +1057,8 @@ static int mpc52xx_fec_of_resume(struct of_device *op)
 #endif
 
 static struct of_device_id mpc52xx_fec_match[] = {
-       {
-               .type           = "network",
-               .compatible     = "mpc5200-fec",
-       },
+       { .type = "network", .compatible = "fsl,mpc5200-fec", },
+       { .type = "network", .compatible = "mpc5200-fec", },
        { }
 };