Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  eHEA: Fix bonding support
  Blackfin ethernet driver: on chip ethernet MAC controller driver
  fix wrong argument of tc35815_read_plat_dev_addr()
  ARM/ETHER3: Handle multicast frames.
  SAA9730: Handle multicast frames.
  NI5010: Handle multicast frames.
  NS83820: Handle multicast frames.
  Fix RGMII-ID handling in gianfar
  Fix Vitesse RGMII-ID support
  Add phy-connection-type to gianfar nodes
  Fix Vitesse 824x PHY interrupt acking
  [PATCH] zd1211rw: Add ID for Siemens Gigaset USB Stick 54
  [PATCH] zd1211rw: Add ID for Planex GW-US54GXS
  [PATCH] Update version ipw2200 stamp to 1.2.2
  [PATCH] ipw2200: Fix ipw_isr() comments error on shared IRQ
  [PATCH] Fix ipw2200 set wrong power parameter causing firmware error
  [PATCH] ipw2100: Fix `iwpriv set_power` error
  [PATCH] softmac: Channel is listed twice in scan output

1 files changed, 4 insertions, 0 deletions

diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
index db56a02b748f..6a78a2b37c08 100644
--- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts
+++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
@@ -131,6 +131,7 @@
                         interrupts = <1d 2 1e 2 22 2>;
                         interrupt-parent = <&mpic>;
                         phy-handle = <&phy0>;
+                        phy-connection-type = "rgmii-id";
                 };
 
                 ethernet@25000 {
@@ -150,6 +151,7 @@
                         interrupts = <23 2 24 2 28 2>;
                         interrupt-parent = <&mpic>;
                         phy-handle = <&phy1>;
+                        phy-connection-type = "rgmii-id";
                 };
                 
                 ethernet@26000 {
@@ -169,6 +171,7 @@
                         interrupts = <1F 2 20 2 21 2>;
                         interrupt-parent = <&mpic>;
                         phy-handle = <&phy2>;
+                        phy-connection-type = "rgmii-id";
                 };
 
                 ethernet@27000 {
@@ -188,6 +191,7 @@
                         interrupts = <25 2 26 2 27 2>;
                         interrupt-parent = <&mpic>;
                         phy-handle = <&phy3>;
+                        phy-connection-type = "rgmii-id";
                 };
                 serial@4500 {
                         device_type = "serial";