diff --git a/[refs] b/[refs]
index ef44af066217..61bfcccaf550 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a48ce84004eb61940850c7066af5d222a5f81c9
+refs/heads/master: 84314bf92265bccea601ed75ec93944e1a36dd81
diff --git a/trunk/drivers/net/r6040.c b/trunk/drivers/net/r6040.c
index 92b14c871351..7ac6fede6e6d 100644
--- a/trunk/drivers/net/r6040.c
+++ b/trunk/drivers/net/r6040.c
@@ -1121,6 +1121,10 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,
 		err = -EIO;
 		goto err_out_free_res;
 	}
+	/* If PHY status change register is still set to zero it means the
+	 * bootloader didn't initialize it */
+	if (ioread16(ioaddr + PHY_CC) == 0)
+		iowrite16(0x9f07, ioaddr + PHY_CC);
 
 	/* Init system & device */
 	lp->base = ioaddr;