diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-11-10 23:43:25 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-11-10 23:43:25 -0500 |
| commit | f74400aed9dbd7ba6712f2f1f02adeb2442bd10d (patch) | |
| tree | 5a295e05711e155709ca3b802f0dd4636a6677ce /arch/powerpc/boot/dts/mpc8569mds.dts | |
| parent | 799dd75b1a8380a967c929a4551895788c374b31 (diff) | |
| parent | e9bcf1418c9ccff30f243005187bbfa659c2df74 (diff) | |
Merge commit 'kumar/merge' into merge
Diffstat (limited to 'arch/powerpc/boot/dts/mpc8569mds.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/mpc8569mds.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/boot/dts/mpc8569mds.dts b/arch/powerpc/boot/dts/mpc8569mds.dts index 06332d61830a..1e3ec8f059bf 100644 --- a/arch/powerpc/boot/dts/mpc8569mds.dts +++ b/arch/powerpc/boot/dts/mpc8569mds.dts | |||
| @@ -487,8 +487,8 @@ | |||
| 487 | &qe_pio_f 5 0 /* USBTN */ | 487 | &qe_pio_f 5 0 /* USBTN */ |
| 488 | &qe_pio_f 6 0 /* USBRP */ | 488 | &qe_pio_f 6 0 /* USBRP */ |
| 489 | &qe_pio_f 8 0 /* USBRN */ | 489 | &qe_pio_f 8 0 /* USBRN */ |
| 490 | &bcsr17 6 0 /* SPEED */ | 490 | &bcsr17 1 0 /* SPEED */ |
| 491 | &bcsr17 5 1>; /* POWER */ | 491 | &bcsr17 2 0>; /* POWER */ |
| 492 | }; | 492 | }; |
| 493 | 493 | ||
| 494 | enet0: ucc@2000 { | 494 | enet0: ucc@2000 { |