diff --git a/[refs] b/[refs]
index eb9ec3ad534a..b04ad0174d8b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0932966b1ca03217c6e0c18375867b1a99ee5af0
+refs/heads/master: 47ec4ed2d23ff3a93f9f575295f17bdaf3d2cec9
diff --git a/trunk/drivers/staging/csr/csr_wifi_hip_chiphelper.c b/trunk/drivers/staging/csr/csr_wifi_hip_chiphelper.c
index 0e2477ff4dd0..a3148d87609a 100644
--- a/trunk/drivers/staging/csr/csr_wifi_hip_chiphelper.c
+++ b/trunk/drivers/staging/csr/csr_wifi_hip_chiphelper.c
@@ -630,7 +630,7 @@ ChipDescript* ChipHelper_GetVersionUniFi(CsrUint16 ver)
 }
 
 
-ChipDescript* ChipHelper_Null()
+ChipDescript *ChipHelper_Null(void)
 {
     return &chip_device_desc_null;
 }