Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 279535
b: refs/heads/master
c: 077200c
h: refs/heads/master
i:
  279533: c542092
  279531: 66ce3f4
  279527: 2ea81b1
  279519: 7f6015b
v: v3
  • Loading branch information
Kai Jiang authored and Kumar Gala committed Nov 24, 2011
1 parent ea5abdc commit ccbf9e2
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: abc3aeae3aaa5c319d02f12649e17ea5929999aa
refs/heads/master: 077200cb5a82eff2393c0af60d0690052a862b5e
2 changes: 1 addition & 1 deletion trunk/arch/powerpc/platforms/85xx/corenet_ds.c
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ static const struct of_device_id of_device_ids[] __devinitconst = {
.compatible = "simple-bus"
},
{
.compatible = "fsl,rapidio-delta",
.compatible = "fsl,srio",
},
{
.compatible = "fsl,p4080-pcie",
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/powerpc/platforms/85xx/mpc85xx_mds.c
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ static struct of_device_id mpc85xx_ids[] = {
{ .compatible = "soc", },
{ .compatible = "simple-bus", },
{ .compatible = "gianfar", },
{ .compatible = "fsl,rapidio-delta", },
{ .compatible = "fsl,srio", },
{ .compatible = "fsl,mpc8548-guts", },
{ .compatible = "gpio-leds", },
{},
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ mpc86xx_time_init(void)

static __initdata struct of_device_id of_bus_ids[] = {
{ .compatible = "simple-bus", },
{ .compatible = "fsl,rapidio-delta", },
{ .compatible = "fsl,srio", },
{ .compatible = "gianfar", },
{},
};
Expand Down

0 comments on commit ccbf9e2

Please sign in to comment.