---

yaml --- r: 318166 b: refs/heads/master c: c80b2e3 h: refs/heads/master v: v3
git-mirror · Jul 20, 2012 · 26cdd8e · 26cdd8e
1 parent d8159bd
commit 26cdd8e
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85a334e3ce9cc94ab02968882ba7235237c7920d
+refs/heads/master: c80b2e3f62f335b137e02b63c339e33831407702
diff --git a/trunk/drivers/staging/csr/csr_util.c b/trunk/drivers/staging/csr/csr_util.c
@@ -42,12 +42,6 @@ void *CsrMemCpy(void *dest, const void *src, size_t count)
     return memcpy(dest, src, count);
 }
 EXPORT_SYMBOL_GPL(CsrMemCpy);
-
-void *CsrMemMove(void *dest, const void *src, size_t count)
-{
-    return memmove(dest, src, count);
-}
-EXPORT_SYMBOL_GPL(CsrMemMove);
 #endif
 
 #ifndef CSR_USE_STDC_LIB

diff --git a/trunk/drivers/staging/csr/csr_util.h b/trunk/drivers/staging/csr/csr_util.h
@@ -28,7 +28,6 @@ void CsrUInt16ToHex(u16 number, char *str);
 /*------------------------------------------------------------------*/
 #ifdef CSR_USE_STDC_LIB
 #define CsrMemCpy memcpy
-#define CsrMemMove memmove
 #define CsrStrCpy strcpy
 #define CsrStrNCpy strncpy
 #define CsrStrCmp(s1, s2) ((s32) strcmp((s1), (s2)))
@@ -37,7 +36,6 @@ void CsrUInt16ToHex(u16 number, char *str);
 #define CsrStrLen strlen
 #else /* !CSR_USE_STDC_LIB */
 void *CsrMemCpy(void *dest, const void *src, size_t count);
-void *CsrMemMove(void *dest, const void *src, size_t count);
 char *CsrStrCpy(char *dest, const char *src);
 char *CsrStrNCpy(char *dest, const char *src, size_t count);
 s32 CsrStrCmp(const char *string1, const char *string2);