patch-2.4.10 linux/drivers/net/wan/cycx_main.c

• Lines: 19
• Date: Thu Sep 13 16:04:43 2001
• Orig file: v2.4.9/linux/drivers/net/wan/cycx_main.c
• Orig date: Mon Aug 27 12:41:43 2001

diff -u --recursive --new-file v2.4.9/linux/drivers/net/wan/cycx_main.c linux/drivers/net/wan/cycx_main.c
@@ -56,6 +56,7 @@
 
 MODULE_AUTHOR("Arnaldo Carvalho de Melo");
 MODULE_DESCRIPTION("Cyclom 2X Sync Card Driver.");
+MODULE_LICENSE("GPL");
 MODULE_PARM(cycx_debug, "i");
 MODULE_PARM_DESC(cycx_debug, "cyclomx debug level");
 
@@ -111,8 +112,8 @@
 		fullname, DRV_VERSION, DRV_RELEASE, copyright);
 
 	/* Verify number of cards and allocate adapter data space */
-	ncards = min(int, ncards, MAX_CARDS);
-	ncards = max(int, ncards, 1);
+	ncards = min_t(int, ncards, MAX_CARDS);
+	ncards = max_t(int, ncards, 1);
 	card_array = kmalloc(sizeof(cycx_t) * ncards, GFP_KERNEL);
 	if (!card_array)
 		goto out;