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] pasemi: Remove warning in mpic_pasemi_msi.c
  [POWERPC] pasemi: Register i2c devices at boot
  [POWERPC] cell: fix spurious false return from spu_trap_data_{map,seg}
  [POWERPC] Fix warning in pseries/power.c
  [POWERPC] Fix bootwrapper builds with older gcc versions
  [POWERPC] Fix dt_mem_next_cell() to read the full address
  [POWERPC] Kill sparse warnings in kprobes
  [POWERPC] spufs: fix scheduler starvation by idle contexts
  [POWERPC] 44x: Add multiplatform defconfig
  [POWERPC] 44x: Fix Kconfig formatting
  [POWERPC] 4xx: Update defconfigs for 2.6.25
  [POWERPC] 4xx: Remove "i2c" and "xxmii-interface" device_types from dts
  [POWERPC] PPC440EP Interrupt Triggering and Level Settings
  [POWERPC] net: NEWEMAC: Remove "rgmii-interface" from rgmii matching table

1 files changed, 0 insertions, 4 deletions

diff --git a/arch/powerpc/boot/dts/rainier.dts b/arch/powerpc/boot/dts/rainier.dts
index d3c2ac394ce9..f947c75a2e94 100644
--- a/arch/powerpc/boot/dts/rainier.dts
+++ b/arch/powerpc/boot/dts/rainier.dts
@@ -229,7 +229,6 @@
                         };
 
                         IIC0: i2c@ef600700 {
-                                device_type = "i2c";
                                 compatible = "ibm,iic-440grx", "ibm,iic";
                                 reg = <ef600700 14>;
                                 interrupt-parent = <&UIC0>;
@@ -237,7 +236,6 @@
                         };
 
                         IIC1: i2c@ef600800 {
-                                device_type = "i2c";
                                 compatible = "ibm,iic-440grx", "ibm,iic";
                                 reg = <ef600800 14>;
                                 interrupt-parent = <&UIC0>;
@@ -245,13 +243,11 @@
                         };
 
                         ZMII0: emac-zmii@ef600d00 {
-                                device_type = "zmii-interface";
                                 compatible = "ibm,zmii-440grx", "ibm,zmii";
                                 reg = <ef600d00 c>;
                         };
 
                         RGMII0: emac-rgmii@ef601000 {
-                                device_type = "rgmii-interface";
                                 compatible = "ibm,rgmii-440grx", "ibm,rgmii";
                                 reg = <ef601000 8>;
                                 has-mdio;