patch-2.3.43 linux/drivers/net/ltpc.c

Next file: linux/drivers/net/mace.c
Previous file: linux/drivers/net/loopback.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.42/linux/drivers/net/ltpc.c linux/drivers/net/ltpc.c
@@ -1250,8 +1250,12 @@
 }
 
 /* handles "ltpc=io,irq,dma" kernel command lines */
-void __init ltpc_setup(char *str, int *ints)
+static int __init ltpc_setup(char *str)
 {
+	int ints[5];
+
+	str = get_options(str, ARRAY_SIZE(ints), ints);
+
 	if (ints[0] == 0) {
 		if (str && !strncmp(str, "auto", 4)) {
 			/* do nothing :-) */
@@ -1261,21 +1265,23 @@
 			printk (KERN_ERR
 				"ltpc: usage: ltpc=auto|iobase[,irq[,dma]]\n");
 		}
-		return;
+		return 1;
 	} else {
 		io = ints[1];
 		if (ints[0] > 1) {
 			irq = ints[2];
-			return;
+			return 1;
 		}
 		if (ints[0] > 2) {
 			dma = ints[3];
-			return;
+			return 1;
 		}
 		/* ignore any other paramters */
 	}
-	return;
+	return 1;
 }
+
+__setup("ltpc=", ltpc_setup);
 
 #ifdef MODULE
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)