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

c8ebce6e · Linus Torvalds · 0676fc12 · b2281abf · c8ebce6e
Commit c8ebce6e authored Nov 04, 2005 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/serial/8250_early.c drivers/serial/8250_early.c +1 -1

No files found.
--- 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 {