git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/fs/xfs/xfs
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
85xx
/
mpc8536_ds.c
diff --git
a/arch/powerpc/platforms/85xx/mpc8536_ds.c
b/arch/powerpc/platforms/85xx/mpc8536_ds.c
index
1bf5aef
..
63efca2
100644
(file)
--- a/
arch/powerpc/platforms/85xx/mpc8536_ds.c
+++ b/
arch/powerpc/platforms/85xx/mpc8536_ds.c
@@
-92,6
+92,7
@@
static struct of_device_id __initdata mpc8536_ds_ids[] = {
{ .type = "soc", },
{ .compatible = "soc", },
{ .compatible = "simple-bus", },
+ { .compatible = "gianfar", },
{},
};