diff --git a/[refs] b/[refs]
index 5edc49b24327..dda9c292f8d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de90351219a1f1fd3cb45cf6fcc4e9d6407fd2c9
+refs/heads/master: 6a290e3d5d48e8932fae068a558b3d8dff4c7acf
diff --git a/trunk/drivers/net/pasemi_mac.c b/trunk/drivers/net/pasemi_mac.c
index 912bc5d33d28..daba11062d3b 100644
--- a/trunk/drivers/net/pasemi_mac.c
+++ b/trunk/drivers/net/pasemi_mac.c
@@ -789,7 +789,10 @@ static int pasemi_mac_open(struct net_device *dev)
 	flags = PAS_MAC_CFG_PCFG_S1 | PAS_MAC_CFG_PCFG_PE |
 		PAS_MAC_CFG_PCFG_PR | PAS_MAC_CFG_PCFG_CE;
 
-	flags |= PAS_MAC_CFG_PCFG_TSR_1G | PAS_MAC_CFG_PCFG_SPD_1G;
+	if (mac->type == MAC_TYPE_GMAC)
+		flags |= PAS_MAC_CFG_PCFG_TSR_1G | PAS_MAC_CFG_PCFG_SPD_1G;
+	else
+		flags |= PAS_MAC_CFG_PCFG_TSR_10G | PAS_MAC_CFG_PCFG_SPD_10G;
 
 	write_iob_reg(mac, PAS_IOB_DMA_RXCH_CFG(mac->dma_rxch),
 			   PAS_IOB_DMA_RXCH_CFG_CNTTH(0));