Merge branch 'for-2.6.25' of git://git.secretlab.ca/git/linux-2.6-mpc52xx

2 files changed, 5 insertions, 9 deletions

diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c
index f91ee700e605..58b71e60204e 100644
--- a/drivers/net/fec_mpc52xx.c
+++ b/drivers/net/fec_mpc52xx.c
@@ -1057,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", },
         { }
 };
 
diff --git a/drivers/net/fec_mpc52xx_phy.c b/drivers/net/fec_mpc52xx_phy.c
index ba6e8b218e0a..1837584c4504 100644
--- 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 = {