Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[~andy/linux] / drivers / net / gianfar.h

diff --git a/drivers/net/gianfar.h b/drivers/net/gianfar.h
index 710810e2adb4aedc86f9c96051a3ee76980970a7..68984eb88ae03ed519ca9ce8dfdcaa2df7f827a8 100644 (file)
--- a/drivers/net/gianfar.h
+++ b/drivers/net/gianfar.h
@@ -1054,7 +1054,7 @@ struct gfar_private {
 
        struct device_node *node;
        struct net_device *ndev;
-       struct of_device *ofdev;
+       struct platform_device *ofdev;
        enum gfar_errata errata;
 
        struct gfar_priv_grp gfargrp[MAXGROUPS];