Merge bk://kernel.bkbits.net/acme/net-2.5

into nuts.ninka.net:/home/davem/src/BK/net-2.5

drivers/net/wan/cycx_drv.c

@@ -343,7 +343,7 @@ static int cycx_data_boot(u32 addr, u8 *code, u32 len)
 
 	for (i = 0 ; i < len ; i += CFM_LOAD_BUFSZ)
 		if (buffer_load(addr, code + i,
-				MIN(CFM_LOAD_BUFSZ, (len - i))) < 0) {
+				min_t(u32, CFM_LOAD_BUFSZ, (len - i))) < 0) {
 			printk(KERN_ERR "%s: Error !!\n", modname);
 			return -1;
 		}
@@ -374,7 +374,7 @@ static int cycx_code_boot(u32 addr, u8 *code, u32 len)
 
 	for (i = 0 ; i < len ; i += CFM_LOAD_BUFSZ)
 		if (buffer_load(addr, code + i,
-				MIN(CFM_LOAD_BUFSZ, (len - i)))) {
+				min_t(u32, CFM_LOAD_BUFSZ, (len - i)))) {
 			printk(KERN_ERR "%s: Error !!\n", modname);
 			return -1;
 		}

include/linux/cycx_drv.h

@@ -37,10 +37,6 @@
 #define	DATA_OFFSET	0x0100	/* For code and data files load */
 #define	START_OFFSET	0x3ff0	/* 80186 starts here */
 
-#ifndef MIN
-#define MIN(a,b)	((a) < (b) ? (a) : (b))
-#endif
-
 /**
  *	struct cycx_hw - Adapter hardware configuration
  *	@fwid - firmware ID