diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-03-21 10:56:04 +1100 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-03-21 10:56:04 +1100 |
commit | 4286f84ef6d7f44de1e70b904706bdc3e1f7af01 (patch) | |
tree | 1fd5fc121f508525d62b0bdf7cc22f16c18b110d /arch/powerpc/boot/dts/fsl/mpc8548si-pre.dtsi | |
parent | 2d87e06e7477fa1467e730087b68c2f518c0fff6 (diff) | |
parent | e96dde2b5edbc0d385ccced05fb5db68c070b0d4 (diff) |
Merge remote-tracking branch 'kumar/next' into next
Diffstat (limited to 'arch/powerpc/boot/dts/fsl/mpc8548si-pre.dtsi')
-rw-r--r-- | arch/powerpc/boot/dts/fsl/mpc8548si-pre.dtsi | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/boot/dts/fsl/mpc8548si-pre.dtsi b/arch/powerpc/boot/dts/fsl/mpc8548si-pre.dtsi index 289f1218d75..720422d8352 100644 --- a/arch/powerpc/boot/dts/fsl/mpc8548si-pre.dtsi +++ b/arch/powerpc/boot/dts/fsl/mpc8548si-pre.dtsi @@ -43,7 +43,9 @@ serial0 = &serial0; serial1 = &serial1; ethernet0 = &enet0; - ethernet1 = &enet2; + ethernet1 = &enet1; + ethernet2 = &enet2; + ethernet3 = &enet3; pci0 = &pci0; pci1 = &pci1; pci2 = &pci2; |