From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Dec 2011 03:37:26 +0000 (+1100)
Subject: Merge remote-tracking branch 'net-next/master'
X-Git-Tag: next-20111213~55
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2d3b2ab540312d9c6e302760f7e3e991873e5867;p=karo-tx-linux.git

Merge remote-tracking branch 'net-next/master'

Conflicts:
	drivers/net/ethernet/freescale/fsl_pq_mdio.c
---

2d3b2ab540312d9c6e302760f7e3e991873e5867
diff --cc drivers/net/ethernet/freescale/fec.c
index c136230d50bb,01ee9cc417b2..4ea2bdc852f8
--- a/drivers/net/ethernet/freescale/fec.c
+++ b/drivers/net/ethernet/freescale/fec.c
@@@ -1032,10 -1040,14 +1041,14 @@@ static int fec_enet_mii_init(struct pla
  	 * mdio interface in board design, and need to be configured by
  	 * fec0 mii_bus.
  	 */
 -	if ((id_entry->driver_data & FEC_QUIRK_ENET_MAC) && pdev->id > 0) {
 +	if ((id_entry->driver_data & FEC_QUIRK_ENET_MAC) && fep->dev_id > 0) {
  		/* fec1 uses fec0 mii_bus */
- 		fep->mii_bus = fec0_mii_bus;
- 		return 0;
+ 		if (mii_cnt && fec0_mii_bus) {
+ 			fep->mii_bus = fec0_mii_bus;
+ 			mii_cnt++;
+ 			return 0;
+ 		}
+ 		return -ENOENT;
  	}
  
  	fep->mii_timeout = 0;