From a8c858eb8464be8f58d59dc210ceca20c5351625 Mon Sep 17 00:00:00 2001
From: Emil Goode <emilgoode@gmail.com>
Date: Sat, 7 Jul 2012 20:44:49 +0200
Subject: [PATCH] --- yaml --- r: 317767 b: refs/heads/master c:
 47ec4ed2d23ff3a93f9f575295f17bdaf3d2cec9 h: refs/heads/master i:   317765:
 5d476450c26e3570ed87dc19648608c9d3407259   317763:
 8ad07de7fca2fa21066df89f1b64345977cf80ab   317759:
 421f7266ab0676f3d260149e09bb27a3524f5790 v: v3

---
 [refs]                                              | 2 +-
 trunk/drivers/staging/csr/csr_wifi_hip_chiphelper.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;
 }