From 530cea3aecbe905e5569ce38b63c68f41087de2d Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 20 Jul 2012 14:42:02 -0700
Subject: [PATCH] --- yaml --- r: 318171 b: refs/heads/master c:
 6a4f6d38a34a992f8fd1572fc8d5706c11089d5e h: refs/heads/master i:   318169:
 a6284c2cac561973eea47cf35ab54ca1e09f6515   318167:
 380f3a456d4249388c63e049a941f1cf37a2bda5 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/staging/csr/csr_util.c | 5 -----
 trunk/drivers/staging/csr/csr_util.h | 2 --
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 8e5129dd747d..5d35535fb642 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45755da2d88b7e0ff9ab037968d64f27f0820317
+refs/heads/master: 6a4f6d38a34a992f8fd1572fc8d5706c11089d5e
diff --git a/trunk/drivers/staging/csr/csr_util.c b/trunk/drivers/staging/csr/csr_util.c
index f7fd3fb7b506..fa6025a59c98 100644
--- a/trunk/drivers/staging/csr/csr_util.c
+++ b/trunk/drivers/staging/csr/csr_util.c
@@ -50,11 +50,6 @@ size_t CsrStrLen(const char *string)
     return strlen(string);
 }
 EXPORT_SYMBOL_GPL(CsrStrLen);
-
-char *CsrStrChr(const char *string, char c)
-{
-    return strchr(string, c);
-}
 #endif
 
 s32 CsrVsnprintf(char *string, size_t count, const char *format, va_list args)
diff --git a/trunk/drivers/staging/csr/csr_util.h b/trunk/drivers/staging/csr/csr_util.h
index 95030fa29ce7..024b520a1bb9 100644
--- a/trunk/drivers/staging/csr/csr_util.h
+++ b/trunk/drivers/staging/csr/csr_util.h
@@ -28,11 +28,9 @@ void CsrUInt16ToHex(u16 number, char *str);
 /*------------------------------------------------------------------*/
 #ifdef CSR_USE_STDC_LIB
 #define CsrMemCpy memcpy
-#define CsrStrChr strchr
 #define CsrStrLen strlen
 #else /* !CSR_USE_STDC_LIB */
 void *CsrMemCpy(void *dest, const void *src, size_t count);
-char *CsrStrChr(const char *string, char c);
 size_t CsrStrLen(const char *string);
 #endif /* !CSR_USE_STDC_LIB */
 s32 CsrVsnprintf(char *string, size_t count, const char *format, va_list args);