diff options
| author | Andy Shevchenko <andy.shevchenko@gmail.com> | 2010-10-12 16:22:48 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-12 09:03:29 -0700 |
| commit | 97eea3afa2b10900c2373458eb4f0341357e8bf8 (patch) | |
| tree | 196a0056371fd854e8d694bcd368a9b4175fa1a0 | |
| parent | ba07d0cbc919613ce48acc0a43d6e8ab35cd7748 (diff) | |
staging: rt2860: remove custom min() and max()
Signed-off-by: Andy Shevchenko <ext-andriy.shevchenko@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/rt2860/common/ba_action.c | 1 | ||||
| -rw-r--r-- | drivers/staging/rt2860/common/mlme.c | 1 | ||||
| -rw-r--r-- | drivers/staging/rt2860/rtmp.h | 8 | ||||
| -rw-r--r-- | drivers/staging/rt2860/sta/rtmp_data.c | 1 |
4 files changed, 3 insertions, 8 deletions
diff --git a/drivers/staging/rt2860/common/ba_action.c b/drivers/staging/rt2860/common/ba_action.c index 1befe9919d09..8eef82d92621 100644 --- a/drivers/staging/rt2860/common/ba_action.c +++ b/drivers/staging/rt2860/common/ba_action.c @@ -26,6 +26,7 @@ */ #include "../rt_config.h" +#include <linux/kernel.h> #define BA_ORI_INIT_SEQ (pEntry->TxSeq[TID]) /*1 // inital sequence number of BA session */ diff --git a/drivers/staging/rt2860/common/mlme.c b/drivers/staging/rt2860/common/mlme.c index 3558f65c9c1b..7300c6e9c175 100644 --- a/drivers/staging/rt2860/common/mlme.c +++ b/drivers/staging/rt2860/common/mlme.c @@ -38,6 +38,7 @@ #include "../rt_config.h" #include <stdarg.h> +#include <linux/kernel.h> u8 CISCO_OUI[] = { 0x00, 0x40, 0x96 }; diff --git a/drivers/staging/rt2860/rtmp.h b/drivers/staging/rt2860/rtmp.h index f133c8cb6807..ca54e53b6603 100644 --- a/drivers/staging/rt2860/rtmp.h +++ b/drivers/staging/rt2860/rtmp.h @@ -324,14 +324,6 @@ struct rt_rtmp_sg_list { /* */ /* Some utility macros */ /* */ -#ifndef min -#define min(_a, _b) (((_a) < (_b)) ? (_a) : (_b)) -#endif - -#ifndef max -#define max(_a, _b) (((_a) > (_b)) ? (_a) : (_b)) -#endif - #define GET_LNA_GAIN(_pAd) ((_pAd->LatchRfRegs.Channel <= 14) ? (_pAd->BLNAGain) : ((_pAd->LatchRfRegs.Channel <= 64) ? (_pAd->ALNAGain0) : ((_pAd->LatchRfRegs.Channel <= 128) ? (_pAd->ALNAGain1) : (_pAd->ALNAGain2)))) #define INC_COUNTER64(Val) (Val.QuadPart++) diff --git a/drivers/staging/rt2860/sta/rtmp_data.c b/drivers/staging/rt2860/sta/rtmp_data.c index fbe903c530be..23879b7cd49a 100644 --- a/drivers/staging/rt2860/sta/rtmp_data.c +++ b/drivers/staging/rt2860/sta/rtmp_data.c @@ -35,6 +35,7 @@ -------- ---------- ---------------------------------------------- */ #include "../rt_config.h" +#include <linux/kernel.h> void STARxEAPOLFrameIndicate(struct rt_rtmp_adapter *pAd, struct rt_mac_table_entry *pEntry, |