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/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
85xx
/
mpc85xx_ads.c
diff --git
a/arch/powerpc/platforms/85xx/mpc85xx_ads.c
b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
index
21f0090
..
9438a89
100644
(file)
--- a/
arch/powerpc/platforms/85xx/mpc85xx_ads.c
+++ b/
arch/powerpc/platforms/85xx/mpc85xx_ads.c
@@
-226,6
+226,7
@@
static struct of_device_id __initdata of_bus_ids[] = {
{ .name = "cpm", },
{ .name = "localbus", },
{ .compatible = "simple-bus", },
+ { .compatible = "gianfar", },
{},
};