diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-04-01 00:22:26 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-04-01 00:22:26 -0400 |
| commit | 399f486286f44d55c4fff0e9cc5d712f2b443489 (patch) | |
| tree | 0c2820b3e04232eaa96f08c1057b87728fb3e7a4 /arch/powerpc/boot/dts/lite5200b.dts | |
| parent | 481419ec9fbdf3f4ec5389c7e91a81b4a7ebee8d (diff) | |
| parent | a9edadbf790d72adf6ebed476cb5caf7743e7e4a (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'arch/powerpc/boot/dts/lite5200b.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/lite5200b.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/boot/dts/lite5200b.dts b/arch/powerpc/boot/dts/lite5200b.dts index 571ba02accac..2e9bc397ae9a 100644 --- a/arch/powerpc/boot/dts/lite5200b.dts +++ b/arch/powerpc/boot/dts/lite5200b.dts | |||
| @@ -270,7 +270,7 @@ | |||
| 270 | mdio@3000 { | 270 | mdio@3000 { |
| 271 | #address-cells = <1>; | 271 | #address-cells = <1>; |
| 272 | #size-cells = <0>; | 272 | #size-cells = <0>; |
| 273 | compatible = "fsl,mpc5200b-mdio"; | 273 | compatible = "fsl,mpc5200b-mdio", "fsl,mpc5200-mdio"; |
| 274 | reg = <3000 400>; // fec range, since we need to setup fec interrupts | 274 | reg = <3000 400>; // fec range, since we need to setup fec interrupts |
| 275 | interrupts = <2 5 0>; // these are for "mii command finished", not link changes & co. | 275 | interrupts = <2 5 0>; // these are for "mii command finished", not link changes & co. |
| 276 | interrupt-parent = <&mpc5200_pic>; | 276 | interrupt-parent = <&mpc5200_pic>; |