diff --git a/[refs] b/[refs]
index da967ece325a..b593a8842704 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d8949448b68b3b355036c8061e3282388826ec5
+refs/heads/master: 8304b633c5e8c9ba34d3cc7f24f52434d3a3b93b
diff --git a/trunk/drivers/net/pasemi_mac.c b/trunk/drivers/net/pasemi_mac.c
index 07475bb7d860..7345a81bb2c6 100644
--- a/trunk/drivers/net/pasemi_mac.c
+++ b/trunk/drivers/net/pasemi_mac.c
@@ -1064,11 +1064,12 @@ static int pasemi_mac_open(struct net_device *dev)
 	write_mac_reg(mac, PAS_MAC_CFG_PCFG, flags);
 
 	ret = pasemi_mac_phy_init(dev);
-	/* Some configs don't have PHYs (XAUI etc), so don't complain about
-	 * failed init due to -ENODEV.
+	/* Warn for missing PHY on SGMII (1Gig) ports.
 	 */
-	if (ret && ret != -ENODEV)
-		dev_warn(&mac->pdev->dev, "phy init failed: %d\n", ret);
+	if (ret && mac->type == MAC_TYPE_GMAC) {
+		dev_warn(&mac->pdev->dev, "PHY init failed: %d.\n", ret);
+		dev_warn(&mac->pdev->dev, "Defaulting to 1Gbit full duplex\n");
+	}
 
 	netif_start_queue(dev);
 	napi_enable(&mac->napi);