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

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

diff --git a/drivers/net/sunbmac.h b/drivers/net/sunbmac.h
index 8840bc0b840b34e6e34817f3f9dc0d9d3b6d9ffa..8db88945b8899d83cb5dc2ab387d9d885a2810ba 100644 (file)
--- a/drivers/net/sunbmac.h
+++ b/drivers/net/sunbmac.h
@@ -329,8 +329,8 @@ struct bigmac {
        unsigned int            timer_ticks;
 
        struct net_device_stats enet_stats;
-       struct of_device        *qec_op;
-       struct of_device        *bigmac_op;
+       struct platform_device  *qec_op;
+       struct platform_device  *bigmac_op;
        struct net_device       *dev;
 };