Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

[linux-2.6-omap-h63xx.git] / drivers / net / fec_mpc52xx_phy.c

diff --git a/drivers/net/fec_mpc52xx_phy.c b/drivers/net/fec_mpc52xx_phy.c
index ba6e8b218e0ae0ad3472fe1376acd2d049696b76..1837584c4504dd82f56db27d9326d9763b3ffe83 100644 (file)
--- a/drivers/net/fec_mpc52xx_phy.c
+++ b/drivers/net/fec_mpc52xx_phy.c
@@ -177,11 +177,9 @@ static int mpc52xx_fec_mdio_remove(struct of_device *of)
 
 
 static struct of_device_id mpc52xx_fec_mdio_match[] = {
-       {
-               .type = "mdio",
-               .compatible = "mpc5200b-fec-phy",
-       },
-       {},
+       { .compatible = "fsl,mpc5200b-mdio", },
+       { .compatible = "mpc5200b-fec-phy", },
+       {}
 };
 
 struct of_platform_driver mpc52xx_fec_mdio_driver = {