diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-11 17:10:00 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-11 17:10:00 +1100 |
| commit | d6ee6f7e4c74d9a0fed7544f4d389bde004651d3 (patch) | |
| tree | 0edb2cc9cdfc4d0ec15f4c6b694857db2db12d17 /arch/powerpc/platforms | |
| parent | ac4dff224d8be65090f4d7d7bde5a0bba6ca90cc (diff) | |
| parent | 48b3fd14bd119cd20b0f9696363683a14a8f88bd (diff) | |
| download | talos-obmc-linux-d6ee6f7e4c74d9a0fed7544f4d389bde004651d3.tar.gz talos-obmc-linux-d6ee6f7e4c74d9a0fed7544f4d389bde004651d3.zip | |
Merge commit 'gcl/next' into next
Diffstat (limited to 'arch/powerpc/platforms')
| -rw-r--r-- | arch/powerpc/platforms/52xx/mpc52xx_common.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_common.c b/arch/powerpc/platforms/52xx/mpc52xx_common.c index 98367a0255f3..e9d2cf632eeb 100644 --- a/arch/powerpc/platforms/52xx/mpc52xx_common.c +++ b/arch/powerpc/platforms/52xx/mpc52xx_common.c @@ -28,9 +28,10 @@ static struct of_device_id mpc52xx_xlb_ids[] __initdata = { static struct of_device_id mpc52xx_bus_ids[] __initdata = { { .compatible = "fsl,mpc5200-immr", }, { .compatible = "fsl,mpc5200b-immr", }, - { .compatible = "fsl,lpb", }, + { .compatible = "simple-bus", }, /* depreciated matches; shouldn't be used in new device trees */ + { .compatible = "fsl,lpb", }, { .type = "builtin", .compatible = "mpc5200", }, /* efika */ { .type = "soc", .compatible = "mpc5200", }, /* lite5200 */ {} |
