Merge branch 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek...

[mv-sheeva.git] / drivers / staging / wlags49_h2 / hcfdef.h

diff --git a/drivers/staging/wlags49_h2/hcfdef.h b/drivers/staging/wlags49_h2/hcfdef.h
index f7e74bfbadfa647acbd28cd0c25d9b0f2f256159..4e20171b782995dbd866b3585d06a16e70c156c3 100644 (file)
--- 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;