diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-18 10:56:30 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-18 10:56:30 +0400 |
| commit | 1e42198609d73ed1a9adcba2af275c24c2678420 (patch) | |
| tree | 32fd4d9073bfc0f3909af8f9fb4bcff38951d01a /drivers/net/fec_mpc52xx_phy.c | |
| parent | 794eb6bf20ebf992c040ea831cd3a9c64b0c1f7a (diff) | |
| parent | 4b119e21d0c66c22e8ca03df05d9de623d0eb50f (diff) | |
| download | linux-1e42198609d73ed1a9adcba2af275c24c2678420.tar.xz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/fec_mpc52xx_phy.c')
| -rw-r--r-- | drivers/net/fec_mpc52xx_phy.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/fec_mpc52xx_phy.c b/drivers/net/fec_mpc52xx_phy.c index 956836fc5ec0..f5634447276d 100644 --- a/drivers/net/fec_mpc52xx_phy.c +++ b/drivers/net/fec_mpc52xx_phy.c @@ -179,6 +179,7 @@ static int mpc52xx_fec_mdio_remove(struct of_device *of) static struct of_device_id mpc52xx_fec_mdio_match[] = { { .compatible = "fsl,mpc5200b-mdio", }, + { .compatible = "fsl,mpc5200-mdio", }, { .compatible = "mpc5200b-fec-phy", }, {} }; |