--- ecc-devel/ecc.c	2003-02-26 04:21:40.000000000 +0100
+++ ecc-devel/ecc.c	2003-05-18 02:57:53.000000000 +0200
@@ -12,6 +12,15 @@ 
  *	Jonathan Lundell <jlundell at resilience dot com>
  */
 
+#include <linux/config.h> /* retrieve the CONFIG_* macros */
+#if defined(CONFIG_MODVERSIONS) && !defined(MODVERSIONS)
+#  define MODVERSIONS /* force it on */
+#endif
+
+#ifdef MODVERSIONS
+#  include <linux/modversions.h>
+#endif
+
 #define DEBUG	0
 
 #if (LINUX_VERSION_CODE < 0x020401)
@@ -42,8 +51,8 @@ 
 
 #define	ECC_VER	"development"
 
-#define min(a,b)	((a)<(b)?(a):(b))
-#define max(a,b)	((a)>(b)?(a):(b))
+#define emin(a,b)	((a)<(b)?(a):(b))
+#define emax(a,b)	((a)>(b)?(a):(b))
 
 static int ecc_scrub = -1;
 static int ecc_ticks = HZ;
@@ -416,8 +425,8 @@ 
 		{
 			bank[loop].mtype = BANK_SDR;
 			bank[loop].eccmode = cs.ecc_mode;
-			bank[loop].endaddr = min(pci_byte(0x81+loop*2),total_base64MB)<<26;
-			max_endaddr = max(max_endaddr,bank[loop].endaddr);
+			bank[loop].endaddr = emin(pci_byte(0x81+loop*2),total_base64MB)<<26;
+			max_endaddr = emax(max_endaddr,bank[loop].endaddr);
 		}
 		else
 		{