Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (202 commits)
  [POWERPC] Fix compile breakage for 64-bit UP configs
  [POWERPC] Define copy_siginfo_from_user32
  [POWERPC] Add compat handler for PTRACE_GETSIGINFO
  [POWERPC] i2c: Fix build breakage introduced by OF helpers
  [POWERPC] Optimize fls64() on 64-bit processors
  [POWERPC] irqtrace support for 64-bit powerpc
  [POWERPC] Stacktrace support for lockdep
  [POWERPC] Move stackframe definitions to common header
  [POWERPC] Fix device-tree locking vs. interrupts
  [POWERPC] Make pci_bus_to_host()'s struct pci_bus * argument const
  [POWERPC] Remove unused __max_memory variable
  [POWERPC] Simplify xics direct/lpar irq_host setup
  [POWERPC] Use pseries_setup_i8259_cascade() in pseries_mpic_init_IRQ()
  [POWERPC] Turn xics_setup_8259_cascade() into a generic pseries_setup_i8259_cascade()
  [POWERPC] Move xics_setup_8259_cascade() into platforms/pseries/setup.c
  [POWERPC] Use asm-generic/bitops/find.h in bitops.h
  [POWERPC] 83xx: mpc8315 - fix USB UTMI Host setup
  [POWERPC] 85xx: Fix the size of qe muram for MPC8568E
  [POWERPC] 86xx: mpc86xx_hpcn - Temporarily accept old dts node identifier.
  [POWERPC] 86xx: mark functions static, other minor cleanups
  ...

1 files changed, 2 insertions, 4 deletions

diff --git a/arch/powerpc/boot/dts/rainier.dts b/arch/powerpc/boot/dts/rainier.dts
index f947c75a2e94..6a8fa7089ea2 100644
--- a/arch/powerpc/boot/dts/rainier.dts
+++ b/arch/powerpc/boot/dts/rainier.dts
@@ -254,7 +254,6 @@
                         };
 
                         EMAC0: ethernet@ef600e00 {
-                                linux,network-index = <0>;
                                 device_type = "network";
                                 compatible = "ibm,emac-440grx", "ibm,emac-440epx", "ibm,emac4";
                                 interrupt-parent = <&EMAC0>;
@@ -270,7 +269,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";
@@ -284,7 +283,6 @@
                         };
 
                         EMAC1: ethernet@ef600f00 {
-                                linux,network-index = <1>;
                                 device_type = "network";
                                 compatible = "ibm,emac-440grx", "ibm,emac-440epx", "ibm,emac4";
                                 interrupt-parent = <&EMAC1>;
@@ -300,7 +298,7 @@
                                 mal-tx-channel = <1>;
                                 mal-rx-channel = <1>;
                                 cell-index = <1>;
-                                max-frame-size = <5dc>;
+                                max-frame-size = <2328>;
                                 rx-fifo-size = <1000>;
                                 tx-fifo-size = <800>;
                                 phy-mode = "rgmii";