diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-29 22:46:19 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-29 22:46:19 -0400 |
| commit | 0a3108beea9143225119d5e7c72a8e2c64f3eb7d (patch) | |
| tree | 89ec500c03f0704799407265db21966b721c6d3f /arch/powerpc/platforms/85xx/mpc85xx_ds.c | |
| parent | ec78c8ac16e7a5f45e21838ab2f5573200bfcdd3 (diff) | |
| parent | df4b6806d35ca6adedd5c0a7e36ac74af1c32d7a (diff) | |
Merge commit 'kumar/next' into next
Diffstat (limited to 'arch/powerpc/platforms/85xx/mpc85xx_ds.c')
| -rw-r--r-- | arch/powerpc/platforms/85xx/mpc85xx_ds.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ds.c b/arch/powerpc/platforms/85xx/mpc85xx_ds.c index 7326d904202..de66de7a9ca 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_ds.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_ds.c | |||
| @@ -204,6 +204,7 @@ static struct of_device_id __initdata mpc85xxds_ids[] = { | |||
| 204 | { .type = "soc", }, | 204 | { .type = "soc", }, |
| 205 | { .compatible = "soc", }, | 205 | { .compatible = "soc", }, |
| 206 | { .compatible = "simple-bus", }, | 206 | { .compatible = "simple-bus", }, |
| 207 | { .compatible = "gianfar", }, | ||
| 207 | {}, | 208 | {}, |
| 208 | }; | 209 | }; |
| 209 | 210 | ||