| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <6a47ed73fed16a1b398ec4e171fbedad9700a335.1286889640.git.ext-andriy.shevchenko@nokia.com> Date: Tue, 12 Oct 2010 16:22:49 +0300 From: Andy Shevchenko <andy.shevchenko@...il.com> To: devel@...verdev.osuosl.org, linux-kernel@...r.kernel.org Cc: Greg Kroah-Hartman <gregkh@...e.de>, Andy Shevchenko <ext-andriy.shevchenko@...ia.com> Subject: [PATCH 2/2] staging: wlags49_h2: remove custom macros min() and max() Signed-off-by: Andy Shevchenko <ext-andriy.shevchenko@...ia.com> --- drivers/staging/wlags49_h2/hcf.c | 1 + 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 c4fe0ec..d4bdd3e 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 f7e74bf..4e20171 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; -- 1.6.3.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists