Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
This commit is contained in:
@@ -1057,6 +1057,7 @@ static int mpc52xx_fec_of_resume(struct of_device *op)
|
||||
#endif
|
||||
|
||||
static struct of_device_id mpc52xx_fec_match[] = {
|
||||
{ .type = "network", .compatible = "fsl,mpc5200b-fec", },
|
||||
{ .type = "network", .compatible = "fsl,mpc5200-fec", },
|
||||
{ .type = "network", .compatible = "mpc5200-fec", },
|
||||
{ }
|
||||
|
Reference in New Issue
Block a user