git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into locking-for-linus
[sfrench/cifs-2.6.git]
/
arch
/
powerpc
/
platforms
/
85xx
/
mpc85xx_mds.c
diff --git
a/arch/powerpc/platforms/85xx/mpc85xx_mds.c
b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
index 658a36fab3ab8a44c9963d5c6512b8e7d20d437a..7dd029034aec78e57338c54b10e42fae0550da42 100644
(file)
--- a/
arch/powerpc/platforms/85xx/mpc85xx_mds.c
+++ b/
arch/powerpc/platforms/85xx/mpc85xx_mds.c
@@
-265,6
+265,7
@@
static struct of_device_id mpc85xx_ids[] = {
{ .compatible = "simple-bus", },
{ .type = "qe", },
{ .compatible = "fsl,qe", },
+ { .compatible = "gianfar", },
{},
};