diff --git a/[refs] b/[refs]
index fc8b6c921a0f..63a728c82202 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 842ec6ba3bdf6de35359726b0428095fdd0f9b45
+refs/heads/master: baa5251e8c5caf8b242559c8e93657036dfd8d3c
diff --git a/trunk/drivers/staging/vt6656/channel.c b/trunk/drivers/staging/vt6656/channel.c
index 6ad03e492edb..a2460ae1ec42 100644
--- a/trunk/drivers/staging/vt6656/channel.c
+++ b/trunk/drivers/staging/vt6656/channel.c
@@ -34,6 +34,7 @@
  *
  */
 
+#include <linux/kernel.h>
 #include "country.h"
 #include "channel.h"
 #include "rf.h"
@@ -367,7 +368,7 @@ static  struct
 /*                                           1   2   3   4   5   6   7   8   9  10  11  12  13  14  15  16  17  18  19  20  21  22  23  24  25  26  27  28  29  30  31  32  33  34  35  36  37  38  39  40  41  42  43  44  45  46  47  48  49  50  51  52  53  54  55  56  */
 };
 
-#define NUM_RULES	(sizeof(ChannelRuleTab) / sizeof(ChannelRuleTab[0]))
+#define NUM_RULES	ARRAY_SIZE(ChannelRuleTab)
 
 /*---------------------  Export function  -------------------------*/
 /************************************************************************