diff --git a/[refs] b/[refs]
index a858c001ede0..d4cda1535d9e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df472894ab21814edf54a3cd81c8ae7066365e0e
+refs/heads/master: 776f030aa0ed65fbc266219fb858bbfc909d97d2
diff --git a/trunk/drivers/net/wireless/ti/wl18xx/main.c b/trunk/drivers/net/wireless/ti/wl18xx/main.c
index d4e331fb73e3..f5ec6f60db33 100644
--- a/trunk/drivers/net/wireless/ti/wl18xx/main.c
+++ b/trunk/drivers/net/wireless/ti/wl18xx/main.c
@@ -1072,6 +1072,8 @@ int __devinit wl18xx_probe(struct platform_device *pdev)
 		memcpy(&wl->ht_cap, &wl18xx_mimo_ht_cap,
 		       sizeof(wl18xx_mimo_ht_cap));
 
+	wl18xx_conf_init(wl);
+
 	if (!board_type_param) {
 		board_type_param = kstrdup("dvp", GFP_KERNEL);
 		priv->board_type = BOARD_TYPE_DVP_18XX;
@@ -1100,8 +1102,6 @@ int __devinit wl18xx_probe(struct platform_device *pdev)
 
 	wl->enable_11a = enable_11a_param;
 
-	wl18xx_conf_init(wl);
-
 	return wlcore_probe(wl, pdev);
 }