projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'keys-next-fixes-20150114' of git://git.kernel.org/pub/scm/linux/kernel...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
tty
/
serial
/
earlycon.c
diff --git
a/drivers/tty/serial/earlycon.c
b/drivers/tty/serial/earlycon.c
index a514ee6f5406109410bf3748ee8de1467da3100a..64fe25a4285c2d1fe0f13c9ea9c91880fdd40ad9 100644
(file)
--- a/
drivers/tty/serial/earlycon.c
+++ b/
drivers/tty/serial/earlycon.c
@@
-98,7
+98,7
@@
static int __init parse_options(struct earlycon_device *device,
strlcpy(device->options, options, length);
}
- if (
mmio || mmio
32)
+ if (
port->iotype == UPIO_MEM || port->iotype == UPIO_MEM
32)
pr_info("Early serial console at MMIO%s 0x%llx (options '%s')\n",
mmio32 ? "32" : "",
(unsigned long long)port->mapbase,