Merge master.kernel.org:/home/rmk/linux-2.6-serial
diff --git a/drivers/serial/8250_early.c b/drivers/serial/8250_early.c
index b7a5dd7..59ba5d9 100644
--- a/drivers/serial/8250_early.c
+++ b/drivers/serial/8250_early.c
@@ -164,7 +164,7 @@
 
 	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 {