Merge branch 'bkl/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...

[mv-sheeva.git] / drivers / net / niu.h

diff --git a/drivers/net/niu.h b/drivers/net/niu.h
index d6715465f35d58137e5c78b26e4c3f653b7c6598..a41fa8ebe05fbfd8e909c61cd2e3862ff6e6f18d 100644 (file)
--- a/drivers/net/niu.h
+++ b/drivers/net/niu.h
@@ -3236,7 +3236,7 @@ struct niu_phy_ops {
        int (*link_status)(struct niu *np, int *);
 };
 
-struct of_device;
+struct platform_device;
 struct niu {
        void __iomem                    *regs;
        struct net_device               *dev;
@@ -3297,7 +3297,7 @@ struct niu {
        struct niu_vpd                  vpd;
        u32                             eeprom_len;
 
-       struct of_device                *op;
+       struct platform_device          *op;
        void __iomem                    *vir_regs_1;
        void __iomem                    *vir_regs_2;
 };