Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[sfrench/cifs-2.6.git] / arch / powerpc / boot / dts / haleakala.dts

diff --git a/arch/powerpc/boot/dts/haleakala.dts b/arch/powerpc/boot/dts/haleakala.dts
index ae68fefc01b6a054b62eaaaffde5930e983e72dc..b5d95ac24dbf1bd1cb6d589aed908f31f3b152de 100644 (file)
--- a/arch/powerpc/boot/dts/haleakala.dts
+++ b/arch/powerpc/boot/dts/haleakala.dts
@@ -12,7 +12,7 @@
        #address-cells = <1>;
        #size-cells = <1>;
        model = "amcc,haleakala";
-       compatible = "amcc,kilauea";
+       compatible = "amcc,haleakala", "amcc,kilauea";
        dcr-parent = <&/cpus/cpu@0>;
 
        aliases {
@@ -218,7 +218,7 @@
                                mal-tx-channel = <0>;
                                mal-rx-channel = <0>;
                                cell-index = <0>;
-                               max-frame-size = <5dc>;
+                               max-frame-size = <2328>;
                                rx-fifo-size = <1000>;
                                tx-fifo-size = <800>;
                                phy-mode = "rgmii";