diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-25 06:35:48 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-25 06:35:48 +0300 |
| commit | 7c12c92fba4bd985ed6d909e5537468b268dcaa4 (patch) | |
| tree | 569639a44c52335eefa1029f922a5eca8c40362e /arch/powerpc/boot/dts/lite5200b.dts | |
| parent | 5a17558f06993fdc509362f659582b52b0f921e3 (diff) | |
| parent | 16fddf5457d2a7eb5e96ceb016a8f722eca97af6 (diff) | |
| download | linux-7c12c92fba4bd985ed6d909e5537468b268dcaa4.tar.xz | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] mpc5200: Fix incorrect compatible string for the mdio node
[POWERPC] Update some defconfigs
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 @@ mdio@3000 { #address-cells = <1>; #size-cells = <0>; - compatible = "fsl,mpc5200b-mdio"; + compatible = "fsl,mpc5200b-mdio", "fsl,mpc5200-mdio"; reg = <3000 400>; // fec range, since we need to setup fec interrupts interrupts = <2 5 0>; // these are for "mii command finished", not link changes & co. interrupt-parent = <&mpc5200_pic>; |