From a101d438e3bc4d8e17e68059aec68aa4f6b8e010 Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andy.shevchenko@gmail.com>
Date: Tue, 12 Oct 2010 16:22:49 +0300
Subject: [PATCH] --- yaml --- r: 220296 b: refs/heads/master c:
 a252d02f89452c1d99eed7545457f52a71804768 h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/staging/wlags49_h2/hcf.c    | 1 +
 trunk/drivers/staging/wlags49_h2/hcfdef.h | 8 --------
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index bc7be96be6e9..f7fbf9d571aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97eea3afa2b10900c2373458eb4f0341357e8bf8
+refs/heads/master: a252d02f89452c1d99eed7545457f52a71804768
diff --git a/trunk/drivers/staging/wlags49_h2/hcf.c b/trunk/drivers/staging/wlags49_h2/hcf.c
index c4fe0ec95074..d4bdd3ee8be1 100644
--- a/trunk/drivers/staging/wlags49_h2/hcf.c
+++ b/trunk/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/trunk/drivers/staging/wlags49_h2/hcfdef.h b/trunk/drivers/staging/wlags49_h2/hcfdef.h
index f7e74bfbadfa..4e20171b7829 100644
--- a/trunk/drivers/staging/wlags49_h2/hcfdef.h
+++ b/trunk/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;