diff --git a/[refs] b/[refs]
index 842f02ca2e64..a1d7987d7bb2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c51ed93ca0ecbf44ec096f4bd04c12a3e761e6b
+refs/heads/master: 72b845e04e99298e5179b31e8de16afed52a2627
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
index caf4102b54ce..31a16fa67558 100644
--- a/trunk/drivers/net/tg3.c
+++ b/trunk/drivers/net/tg3.c
@@ -9097,6 +9097,10 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)
 	tp->phy_id = PHY_ID_INVALID;
 	tp->led_ctrl = LED_CTRL_MODE_PHY_1;
 
+	/* Do not even try poking around in here on Sun parts.  */
+	if (tp->tg3_flags2 & TG3_FLG2_SUN_570X)
+		return;
+
 	tg3_read_mem(tp, NIC_SRAM_DATA_SIG, &val);
 	if (val == NIC_SRAM_DATA_SIG_MAGIC) {
 		u32 nic_cfg, led_cfg;