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
/
86xx
/
mpc86xx_hpcn.c
diff --git
a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
index
27e0e68
..
c4ec49b
100644
(file)
--- a/
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+++ b/
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@
-148,6
+148,7
@@
mpc86xx_time_init(void)
static __initdata struct of_device_id of_bus_ids[] = {
{ .compatible = "simple-bus", },
{ .compatible = "fsl,rapidio-delta", },
+ { .compatible = "gianfar", },
{},
};