diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-30 23:50:17 (GMT) |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-30 23:50:17 (GMT) |
| commit | 4eece4ccf997c0e6d8fdad3d842e37b16b8d705f (patch) | |
| tree | b8ddfaa3401a6af36ab06829b1b0c31e0ff2fb38 /drivers/net | |
| parent | cda13dd164f91df79ba797ab84848352b03de115 (diff) | |
| parent | 4fb4c5582475452d3bf7c5072ef2d15ee06f7723 (diff) | |
| download | linux-fsl-qoriq-4eece4ccf997c0e6d8fdad3d842e37b16b8d705f.tar.xz | |
Merge branch 'for-2.6.25' of git://git.secretlab.ca/git/linux-2.6-mpc52xx
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/fec_mpc52xx.c | 6 | ||||
| -rw-r--r-- | drivers/net/fec_mpc52xx_phy.c | 8 |
2 files changed, 5 insertions, 9 deletions
diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c index f91ee70..58b71e6 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 ba6e8b2..1837584c 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 = { |