diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
| commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
| tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/vt6656/channel.c | |
| parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
| parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
| download | op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz | |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/vt6656/channel.c')
| -rw-r--r-- | drivers/staging/vt6656/channel.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/vt6656/channel.c b/drivers/staging/vt6656/channel.c index 6ad03e4..99e054d2 100644 --- a/drivers/staging/vt6656/channel.c +++ b/drivers/staging/vt6656/channel.c @@ -34,12 +34,13 @@ * */ +#include <linux/kernel.h> #include "country.h" #include "channel.h" #include "rf.h" /*--------------------- Static Definitions -------------------------*/ -static int msglevel =MSG_LEVEL_INFO; +static int msglevel = MSG_LEVEL_INFO; //static int msglevel =MSG_LEVEL_DEBUG; /*--------------------- Static Classes ----------------------------*/ @@ -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 -------------------------*/ /************************************************************************ @@ -515,10 +516,9 @@ BYTE CHbyGetChannelMapping(BYTE byChannelNumber) BYTE ii; BYTE byCHMapping = 0; - for (ii=1; ii<=CB_MAX_CHANNEL; ii++ ) { - if ( sChannelTbl[ii].byChannelNumber == byChannelNumber ) { - byCHMapping = ii; - } + for (ii = 1; ii <= CB_MAX_CHANNEL; ii++) { + if (sChannelTbl[ii].byChannelNumber == byChannelNumber) + byCHMapping = ii; } return byCHMapping; } |
