Merge master.kernel.org:/home/rmk/linux-2.6-serial

mna · Nov 4, 2005 · c8ebce6 · c8ebce6
2 parents 0676fc1 + b2281ab
commit c8ebce6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/drivers/serial/8250_early.c b/drivers/serial/8250_early.c
@@ -164,7 +164,7 @@ static int __init parse_options(struct early_uart_device *device, char *options)
 
 	if ((options = strchr(options, ','))) {
 		options++;
-		device->baud = simple_strtoul(options, 0, 0);
+		device->baud = simple_strtoul(options, NULL, 0);
 		length = min(strcspn(options, " "), sizeof(device->options));
 		strncpy(device->options, options, length);
 	} else {