diff options
| author | Andy Shevchenko <andy.shevchenko@gmail.com> | 2010-10-12 16:22:49 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-12 09:03:30 -0700 |
| commit | a252d02f89452c1d99eed7545457f52a71804768 (patch) | |
| tree | 65cff9003d50f5b56ced1f06fc4de43bfebde0a4 /drivers | |
| parent | 97eea3afa2b10900c2373458eb4f0341357e8bf8 (diff) | |
| download | linux-rt-a252d02f89452c1d99eed7545457f52a71804768.tar.gz | |
staging: wlags49_h2: remove custom macros min() and max()
Signed-off-by: Andy Shevchenko <ext-andriy.shevchenko@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/wlags49_h2/hcf.c | 1 | ||||
| -rw-r--r-- | drivers/staging/wlags49_h2/hcfdef.h | 8 |
2 files changed, 1 insertions, 8 deletions
diff --git a/drivers/staging/wlags49_h2/hcf.c b/drivers/staging/wlags49_h2/hcf.c index c4fe0ec95074..d4bdd3ee8be1 100644 --- a/drivers/staging/wlags49_h2/hcf.c +++ b/drivers/staging/wlags49_h2/hcf.c @@ -92,6 +92,7 @@ #include "hcf.h" // HCF and MSF common include file #include "hcfdef.h" // HCF specific include file #include "mmd.h" // MoreModularDriver common include file +#include <linux/kernel.h> #if ! defined offsetof #define offsetof(s,m) ((unsigned int)&(((s *)0)->m)) diff --git a/drivers/staging/wlags49_h2/hcfdef.h b/drivers/staging/wlags49_h2/hcfdef.h index f7e74bfbadfa..4e20171b7829 100644 --- a/drivers/staging/wlags49_h2/hcfdef.h +++ b/drivers/staging/wlags49_h2/hcfdef.h @@ -593,14 +593,6 @@ err: ; /************************************** MACROS ************************************************/ /************************************************************************************************/ -/* min and max macros */ -#if ! defined max -#define max(a,b) (((a) > (b)) ? (a) : (b)) -#endif -#if ! defined min -#define min(a,b) (((a) < (b)) ? (a) : (b)) -#endif - #ifdef HCF_SLEEP #if defined MSF_WAIT err: MSF should no longer supply this macro; |