Staging: fix assorted typos all over the place

[safe/jmp/linux-2.6] / drivers / staging / vt6656 / channel.c

diff --git a/drivers/staging/vt6656/channel.c b/drivers/staging/vt6656/channel.c
index 56308b0..f7136b0 100644 (file)
--- a/drivers/staging/vt6656/channel.c
+++ b/drivers/staging/vt6656/channel.c
@@ -19,7 +19,7 @@
  *
  * File: channel.c
  *
- * Purpose: Channel number maping
+ * Purpose: Channel number mapping
  *
  * Author: Lucas Lin
  *
@@ -34,19 +34,9 @@
  *
  */
 
-#if !defined (_COUNTRY_H_)
 #include "country.h"
-#endif
-#if !defined (_CHANNEL_H_)
 #include "channel.h"
-#endif
-#if !defined(__RF_H__)
 #include "rf.h"
-#endif
-#if !defined(__UMEM_H__)
-#include "umem.h"
-#endif
-
 
 /*---------------------  Static Definitions -------------------------*/
 static int          msglevel                =MSG_LEVEL_INFO;
@@ -442,7 +432,7 @@ CHvChannelGetList (
     if (uCountryCodeIdx >= CCODE_MAX) {
         return (FALSE);
     }
-    MEMvCopy(pbyChannelTable, ChannelRuleTab[uCountryCodeIdx].bChannelIdxList, CB_MAX_CHANNEL);
+    memcpy(pbyChannelTable, ChannelRuleTab[uCountryCodeIdx].bChannelIdxList, CB_MAX_CHANNEL);
     return (TRUE);
 }