projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireles...
[linux-2.6-block.git]
/
drivers
/
net
/
fec_mpc52xx.c
diff --git
a/drivers/net/fec_mpc52xx.c
b/drivers/net/fec_mpc52xx.c
index f91ee700e605c051990afb27d350ac38c296b6ff..58b71e60204e6df0b505980c2205814141d5a171 100644
(file)
--- 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", },
{ }
};